From f2fcb9dd488691e5457e12960a0b35dac426a5c5 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 17 Jul 2018 16:43:54 +0200
Subject: [PATCH] migration db conflict resolved
---
...7_voucher_activity_type.py => 0118_voucher_activity_type.py} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename smash/web/migrations/{0117_voucher_activity_type.py => 0118_voucher_activity_type.py} (91%)
diff --git a/smash/web/migrations/0117_voucher_activity_type.py b/smash/web/migrations/0118_voucher_activity_type.py
similarity index 91%
rename from smash/web/migrations/0117_voucher_activity_type.py
rename to smash/web/migrations/0118_voucher_activity_type.py
index ef1198ed..745425a7 100644
--- a/smash/web/migrations/0117_voucher_activity_type.py
+++ b/smash/web/migrations/0118_voucher_activity_type.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('web', '0116_auto_20180611_1346'),
+ ('web', '0117_auto_20180717_1434'),
]
operations = [
--
GitLab