Remove merge leftover.
This commit is contained in:
parent
b4cc3b0f54
commit
8843d8d804
@ -127,7 +127,6 @@ Changelog
|
|||||||
- Put defaultUser.png instead of old defaultUser.gif
|
- Put defaultUser.png instead of old defaultUser.gif
|
||||||
[bsuttor]
|
[bsuttor]
|
||||||
|
|
||||||
>>>>>>> master
|
|
||||||
- Remove bbb directory. bbb was never really implemented.
|
- Remove bbb directory. bbb was never really implemented.
|
||||||
[timo]
|
[timo]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user