Update ElMD.py

lrcfmd · Oct 24, 2022 · d096cd4 · d096cd4
1 parent 13c088c
commit d096cd4
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/ElMD/ElMD.py b/ElMD/ElMD.py
@@ -23,12 +23,7 @@
 __copyright__ = "2019, Cameron Hargreaves"
 __credits__ = ["https://github.com/Zapaan", "Loïc Séguin-C. <[email protected]>", "https://github.com/Bowserinator/"]
 __license__ = "GPL"
-<<<<<<< HEAD
-__version__ = "0.5.5"
-=======
-__version__ = "0.5.4"
->>>>>>> 0c4ba033856e760ba89e61b5390c791bff7be88f
-__maintainer__ = "Cameron Hargreaves"
+__version__ = "0.5.11"
 
 '''
 import json