From 04c4c77c485b85e6ccc2d40e110722fcff56d0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= <katterrina98@gmail.com>
Date: Wed, 1 Jul 2020 19:55:03 +0200
Subject: [PATCH] =?UTF-8?q?minule=20jsem=20ty=20zm=C4=9Bny=20zapomn=C4=9Bl?=
 =?UTF-8?q?a=20ulo=C5=BEit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/views/views_all.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py
index 44f25c3b..78172c74 100644
--- a/seminar/views/views_all.py
+++ b/seminar/views/views_all.py
@@ -245,13 +245,9 @@ def spravne_novinky(request):
 
 class TitulniStranaView(generic.ListView):
 	template_name='seminar/titulnistrana.html'
-<<<<<<< HEAD
-	queryset = Novinky.objects.order_by('-datum')[:2]
-=======
 
 	def get_queryset(self):
 		return spravne_novinky(self.request)[:5]
->>>>>>> data_migrations
 
 	def get_context_data(self, **kwargs):
 		context = super(TitulniStranaView, self).get_context_data(**kwargs)