Solving git problem

2017-08-31 16:49:45 +02:00 · 2017-08-31 16:49:45 +02:00 · 5795600dd6
commit 5795600dd6
parent 23a195c38b f036f960ca
2 changed files with 10 additions and 0 deletions
--- a/themes/zuitedesk/zuitedesk.info
+++ b/themes/zuitedesk/zuitedesk.info
@ -1,6 +1,10 @@
 name        = SuiteDesk Theme
 description = SuiteDesk Theme Zen.
+<<<<<<< HEAD
 version     = 0.2.46
+=======
+version     = 0.2.45
+>>>>>>> f036f960cad6e57914f725e563b60bca5738540a

 screenshot = screenshot.png