From 9004351ad1f430a9a69e044bc2c5acf9744ea7d3 Mon Sep 17 00:00:00 2001
From: wojiushixiaobai <296015668@qq.com>
Date: Thu, 12 Jul 2018 16:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/make_migrations.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/make_migrations.sh b/utils/make_migrations.sh
index fbe3e577c..4fb8fdacf 100755
--- a/utils/make_migrations.sh
+++ b/utils/make_migrations.sh
@@ -5,4 +5,4 @@ python3 ../apps/manage.py makemigrations
 
 python3 ../apps/manage.py migrate
 
-python3 ../apps/manage.py makemigrations –-merge
+python3 ../apps/manage.py makemigrations --merge