Fix last merge

weni-ai · Oct 3, 2018 · 82d639f · 82d639f
1 parent 990c5f4
commit 82d639f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/bothub/api/serializers/update.py → bothub/api/v1/serializers/update.py b/bothub/api/serializers/update.py → bothub/api/v1/serializers/update.py
diff --git a/bothub/api/tests/test_updates.py → bothub/api/v1/tests/test_updates.py b/bothub/api/tests/test_updates.py → bothub/api/v1/tests/test_updates.py
diff --git a/...mon/migrations/0022_auto_20180927_1153.py → ...mon/migrations/0023_auto_20181003_1245.py b/...mon/migrations/0022_auto_20180927_1153.py → ...mon/migrations/0023_auto_20181003_1245.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-09-27 11:53
+# Generated by Django 2.0.6 on 2018-10-03 12:45
 
 from django.conf import settings
 from django.db import migrations, models
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0021_auto_20180921_1259'),
+        ('common', '0022_repositoryupdate_training_log'),
     ]
 
     operations = [