Resolve merge conflict

2020-03-08 00:10:18 -05:00 · 2020-03-08 00:10:18 -05:00 · 1153433a2c
commit 1153433a2c
parent 6da4231939 c5ff2de0bd
55 changed files with 590 additions and 348 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -10,9 +10,12 @@ django-filter >= 2.2.0, < 2.3
 django-sekizai
 inflect
 autobahn >= 17.9.3
-model_mommy
+
+# try to resolve dependency issue in py3.7
+attrs >= 19.2.0

 # testing and development
+model_mommy
 mock >= 1.0.1
 anything
 black