fix: resolve conflicts

escaped · Feb 19, 2021 · 5bc9530 · 5bc9530
1 parent 0830f3e
commit 5bc9530
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 36 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,6 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.6",
   "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
@@ -33,12 +34,15 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.6.1, <4.0"
-django-appconf = "^1.0"
+
 django = ">=2.2"
+
+django-appconf = "^1.0"
 pillow = ">=5.0"
 
 [tool.poetry.dev-dependencies]
 autoflake = "^1.4"
+better-exceptions = "^0.3.2"
 black = "^20.8b1"
 flake8 = "^3.8.3"
 flake8-bugbear = "^20.11.1"

diff --git a/pyproject.toml.rej b/pyproject.toml.rej