From 327a0245082b6a3fdcf70a0e9f0cbfbdfc3485fc Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 17 Sep 2015 11:33:31 +0200 Subject: [PATCH] fix --- teleforma/admin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teleforma/admin.py b/teleforma/admin.py index fdd07bbd..39061ed1 100644 --- 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) -- 2.39.5