fix merge conflict

QuinterApp · Aug 24, 2021 · 91c2014 · 91c2014
1 parent a19d44d
commit 91c2014
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/application.py b/application.py
@@ -1,10 +1,4 @@
 shortname="quinter"
-<<<<<<< HEAD
-name="Quinter"
-version="0.67"
-author="Quin and Melody"
-=======
 name = "Quinter"
 version = "0.67"
 author = "Quin and Melody"
->>>>>>> 7278a0788ee2059ec1d35f21b1232792ffe60a9c