Solving git problem
This commit is contained in:
parent
5795600dd6
commit
063eac3811
2 changed files with 1 additions and 11 deletions
|
@ -1,10 +1,6 @@
|
|||
name = SuiteDesk Theme
|
||||
description = SuiteDesk Theme Zen.
|
||||
<<<<<<< HEAD
|
||||
version = 0.2.46
|
||||
=======
|
||||
version = 0.2.45
|
||||
>>>>>>> f036f960cad6e57914f725e563b60bca5738540a
|
||||
version = 0.2.47
|
||||
|
||||
screenshot = screenshot.png
|
||||
|
||||
|
|
Reference in a new issue