nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge residue

Browse Source
This commit is contained in:
nullifiedcat 2017-04-19 23:02:15 +03:00
parent 0631b9dfec
commit 828d455283
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/ncc/Menu.cpp
View File

@ -580,7 +580,6 @@ static const std::string list_tf2 = R"(
"log" "log"
] ]
] ]
<<<<<<< HEAD
)"; )";
List& MainList() { List& MainList() {