fix

diff --git a/teleforma/admin.py b/teleforma/admin.py
index fdd07bbd82122203d72c63458a818152fb4c7ed6..39061ed17c668349ac4a33a1edd63c357f40c910 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -94,14 +94,14 @@ class TestimonialAdmin(admin.ModelAdmin):
     search_fields = ['seminar__course__title', 'seminar__sub_title',
                     'user__username', 'user__last_name']
 
-<<<<<<< HEAD
+
 class AnswerAdmin(admin.ModelAdmin):
     search_fields = ['user__username', 'user__last_name']
-=======
+
+
 class SeminarRevisionAdmin(admin.ModelAdmin):
     search_fields = ['user__username', 'seminar__title']
 
->>>>>>> ab123a8a998ce88c547a184b409bb3201de46671
 
 admin.site.unregister(User)
 admin.site.register(User, UserProfileAdmin)