jeremiewcz 1 year ago
parent
commit
7b70a665dd
1 changed files with 4 additions and 0 deletions
  1. 4
    0
      app/main/views.py

+ 4
- 0
app/main/views.py View File

@@ -292,7 +292,11 @@ def agendas():
292 292
         'content': {
293 293
             'template': render_template(
294 294
                 "main_pages/agendas.html",
295
+<<<<<<< HEAD
295 296
                 events = events,
297
+=======
298
+                events=Event.list(number=10),
299
+>>>>>>> e9fd0a020737f61fbcb5a3e98079b9d4eddeac37
296 300
                 pagination = pagination),
297 301
             'title': "Agendas"
298 302
         }

Loading…
Cancel
Save