Browse Source

Woopsies cleaning unmerged previous commit

jeremiewcz 2 years ago
parent
commit
62a8f141e9
1 changed files with 0 additions and 4 deletions
  1. 0
    4
      app/main/views.py

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

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

Loading…
Cancel
Save