Erreur lors du rebase

zestedesavoir · Apr 3, 2017 · 6281072 · 6281072
1 parent 3e6d8d2
commit 6281072
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/zds/utils/templatetags/interventions.py b/zds/utils/templatetags/interventions.py
@@ -17,7 +17,6 @@
 from zds.utils.models import Alert
 from zds import settings
 from zds.tutorialv2.models import TYPE_CHOICES_DICT
->>>>>>> tutorialsv2 => tutorialv2
 
 register = template.Library()