refactor: merge migrations

PokeAPI · Nov 30, 2023 · b348e60 · b348e60
1 parent b3d6608
commit b348e60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 37 deletions.
diff --git a/pokemon_v2/migrations/0014_auto_20231119_0303.py b/pokemon_v2/migrations/0014_auto_20231119_0303.py
diff --git a/..._v2/migrations/0016_auto_20231126_1258.py → ..._v2/migrations/0014_auto_20231121_1209.py b/..._v2/migrations/0016_auto_20231126_1258.py → ..._v2/migrations/0014_auto_20231121_1209.py
@@ -1,11 +1,11 @@
-# Generated by Django 3.1.14 on 2023-11-26 12:58
+# Generated by Django 3.1.14 on 2023-11-21 12:09
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("pokemon_v2", "0015_auto_20231121_1209"),
+        ("pokemon_v2", "0013_pokemonabilitypast"),
     ]
 
     operations = [
@@ -14,6 +14,11 @@ class Migration(migrations.Migration):
             name="sprites",
             field=models.JSONField(),
         ),
+        migrations.AlterField(
+            model_name="pokemonsprites",
+            name="sprites",
+            field=models.JSONField(),
+        ),
         migrations.AlterField(
             model_name="pokemonformsprites",
             name="sprites",

diff --git a/pokemon_v2/migrations/0015_auto_20231121_1209.py b/pokemon_v2/migrations/0015_auto_20231121_1209.py