From 828d4552832e059cdde47fe33ca2378648a15761 Mon Sep 17 00:00:00 2001
From: nullifiedcat <nullifiedcat@gmail.com>
Date: Wed, 19 Apr 2017 23:02:15 +0300
Subject: [PATCH] merge residue

---
 src/gui/ncc/Menu.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/ncc/Menu.cpp b/src/gui/ncc/Menu.cpp
index 3899d49b..abf26444 100644
--- 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() {