fix merge conflict

This commit is contained in:
Jm Casler
2020-10-11 21:19:22 -07:00
parent 58cfd1317c
commit 10008d4eef
8 changed files with 118 additions and 94 deletions
+1 -1
View File
@@ -1,3 +1,3 @@
export VERSION=1.1.3
export VERSION=1.1.4