diff options
Diffstat (limited to 'mana.cbp')
| -rw-r--r-- | mana.cbp | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -125,13 +125,10 @@ <Unit filename="src\configlistener.h" /> <Unit filename="src\configuration.cpp" /> <Unit filename="src\configuration.h" /> -<<<<<<< HEAD - <Unit filename="src\dropshortcut.cpp" /> - <Unit filename="src\dropshortcut.h" /> -======= <Unit filename="src\defaults.cpp" /> <Unit filename="src\defaults.h" /> ->>>>>>> master + <Unit filename="src\dropshortcut.cpp" /> + <Unit filename="src\dropshortcut.h" /> <Unit filename="src\effectmanager.cpp" /> <Unit filename="src\effectmanager.h" /> <Unit filename="src\emoteshortcut.cpp" /> |