From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Jul 2012 13:18:39 +0000 (+0200)
Subject: debug again..
X-Git-Tag: 0.7-dev^2~54
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fa7c31cbf3dac48ac5c1605838fa73941c634b4f;p=teleforma.git

debug again..
---

diff --git a/teleforma/management/commands/teleforma-import-conferences.py b/teleforma/management/commands/teleforma-import-conferences.py
index ccdd689f..04866c17 100644
--- 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]