Remove merge leftover.

This commit is contained in:
Timo Stollenwerk 2015-04-27 15:01:13 +02:00
parent b4cc3b0f54
commit 8843d8d804

View File

@ -127,7 +127,6 @@ Changelog
- Put defaultUser.png instead of old defaultUser.gif
[bsuttor]
>>>>>>> master
- Remove bbb directory. bbb was never really implemented.
[timo]