merge residue

2017-04-19 23:02:15 +03:00 · 2017-04-19 23:02:15 +03:00 · 828d455283
commit 828d455283
parent 0631b9dfec
1 changed files with 0 additions and 1 deletions
--- a/src/gui/ncc/Menu.cpp
+++ b/src/gui/ncc/Menu.cpp
@ -580,7 +580,6 @@ static const std::string list_tf2 = R"(
        "log"
    ]
 ]
-<<<<<<< HEAD
 )";

 List& MainList() {