cache changes

parent d5185eba
......@@ -15,8 +15,4 @@ class ReactionAdmin(admin.ModelAdmin):
model = Reaction
admin.site.register(Announcement, AnnouncementAdmin)
<<<<<<< HEAD
admin.site.register(Reaction, ReactionAdmin )
=======
admin.site.register(Reaction, ReactionAdmin)
>>>>>>> e0c34617c8b159b16ec29f2e2bdb82260f013727
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment