Merge pull request #563 from lo-maxwell/master

Fixing merge conflict code that was stuck in the previous commit
compserv · Nov 28, 2023 · 2e8677f · 2e8677f
2 parents bca9625 + 7f3cc8a
commit 2e8677f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,11 +15,8 @@ fabric = "^3.2.2"
 django-autocomplete-light = "^3.9.7"
 djangorestframework = "^3.14.0"
 google-api-python-client = "^2.99.0"
-<<<<<<< HEAD
 pillow = "^9.5.0"
-=======
 icalendar = "^5.0.10"
->>>>>>> aeb8ef26d262cbd2094143129e97b43fb58f6bfd
 
 [tool.poetry.group.prod]
 optional = true
@@ -55,4 +52,4 @@ omit = [
 [tool.coverage.report]
 skip_covered = true
 sort = "miss"
-fail_under = 85
+fail_under = 85