diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-01-26 01:50:32 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-01-26 01:50:32 +0200 |
| commit | 88d896d9bc248bc518fe447e43a95cb36a635446 (patch) | |
| tree | fe9125e8a23e0c8f66a88920842b2f9f7dd3bbf6 /mana.cbp | |
| parent | b107fe6da278e5e2d1aeb37a615ce5ada9700b09 (diff) | |
| download | manaverse-88d896d9bc248bc518fe447e43a95cb36a635446.tar.gz manaverse-88d896d9bc248bc518fe447e43a95cb36a635446.tar.bz2 manaverse-88d896d9bc248bc518fe447e43a95cb36a635446.tar.xz manaverse-88d896d9bc248bc518fe447e43a95cb36a635446.zip | |
Fix old merge error in mana.cbp
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" /> |