From 7de3e158240a5ba07c8dedd1c410cff7bf792958 Mon Sep 17 00:00:00 2001
From: Drew Winstel <drewbrew@users.noreply.github.com>
Date: Wed, 21 Aug 2019 21:21:29 -0500
Subject: [PATCH] merge migrations

---
 beers/migrations/0031_merge_20190822_0221.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 beers/migrations/0031_merge_20190822_0221.py

diff --git a/beers/migrations/0031_merge_20190822_0221.py b/beers/migrations/0031_merge_20190822_0221.py
new file mode 100644
index 00000000..462c0388
--- /dev/null
+++ b/beers/migrations/0031_merge_20190822_0221.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-08-22 02:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('beers', '0030_auto_20190807_2142'),
+        ('beers', '0030_userfavoritebeer'),
+    ]
+
+    operations = [
+    ]