From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 17 Sep 2015 09:33:31 +0000 (+0200)
Subject: fix
X-Git-Tag: 2.8.1-pro~281
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=327a0245082b6a3fdcf70a0e9f0cbfbdfc3485fc;p=teleforma.git

fix
---

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)