Merge conflict fix

2020-05-13 12:37:18 +03:00
parent ccae3aebd5 78004a7b73
commit 5b7d9a9008
985 changed files with 295527 additions and 16121 deletions
@@ -1,3 +1,3 @@
-pygit2==0.27.2
+pygit2==1.0.1
 bidict==0.13.1
-Pillow==6.2.0
+Pillow==7.0.0