fixed conflict

Choirless · Aug 10, 2020 · 24d0d3f · 24d0d3f
2 parents 75d3944 + 1fcc205
commit 24d0d3f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/python/Dockerfile b/python/Dockerfile
@@ -9,5 +9,7 @@ RUN pip3 install importlib_resources \
     "choirless_smiler>=1.1.0" \
     aiohttp \
     "git+https://github.com/Choirless/renderer@f0ec6e91fa5d3cb7fd4d466353582a4756e5c1a0#egg=choirless_lib&subdirectory=python/choirless_lib"
+
+