From 7b4847852a51b4ae0d0d3ea6320bb8dc7a125681 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 24 Nov 2020 13:42:47 -0800
Subject: [PATCH] Merge migrations manually

---
 .../{0012_auto_20201124_2125.py => 0013_book_origin_id.py}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename bookwyrm/migrations/{0012_auto_20201124_2125.py => 0013_book_origin_id.py} (76%)

diff --git a/bookwyrm/migrations/0012_auto_20201124_2125.py b/bookwyrm/migrations/0013_book_origin_id.py
similarity index 76%
rename from bookwyrm/migrations/0012_auto_20201124_2125.py
rename to bookwyrm/migrations/0013_book_origin_id.py
index bbc4942a..581a2406 100644
--- a/bookwyrm/migrations/0012_auto_20201124_2125.py
+++ b/bookwyrm/migrations/0013_book_origin_id.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2020-11-24 21:25
+# Generated by Django 3.0.7 on 2020-11-24 21:42
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0011_auto_20201113_1727'),
+        ('bookwyrm', '0012_attachment'),
     ]
 
     operations = [