debug again..

diff --git a/teleforma/management/commands/teleforma-import-conferences.py b/teleforma/management/commands/teleforma-import-conferences.py
index ccdd689f3a9b1b32e60d3dfcb987767345374b87..04866c17874d819eea1a777d1b894ae3729f7b96 100644 (file)
--- a/teleforma/management/commands/teleforma-import-conferences.py
+++ b/teleforma/management/commands/teleforma-import-conferences.py
@@ -52,19 +52,8 @@ class Command(BaseCommand):
         all_conferences = Conference.objects.all()
         i = 1
 
-<<<<<<< HEAD
-       self.cleanup()
-               
-=======
-        #FIXME:
-        medias = Media.objects.all()
-        for media in medias:
-            media.delete()
-        items = MediaItem.objects.all()
-        for item in items:
-            item.delete()
+        self.cleanup()
 
->>>>>>> 278a443740c34a129f84eb61a443b547a678cb48
         for root, dirs, files in os.walk(self.media_dir):
             for filename in files:
                 name = os.path.splitext(filename)[0]