fix migrations conflict

VEDA_OS01/migrations/0003_auto_20171024_2003.py

@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('VEDA_OS01', '0002_auto_20171016_1211'),
+        ('VEDA_OS01', '0003_auto_20171019_1317'),
     ]
 
     operations = [

VEDA_OS01/migrations/0004_auto_20171108_0714.py

@@ -10,7 +10,7 @@ import model_utils.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('VEDA_OS01', '0003_auto_20171019_1317'),
+        ('VEDA_OS01', '0003_auto_20171024_2003'),
     ]
 
     operations = [