From aa95183b93dcfaa74e0e732259c87e9b9d39d518 Mon Sep 17 00:00:00 2001
From: Rob Loach
Date: Sat, 16 Apr 2016 13:08:12 -0400
Subject: MADS: Remove git conflict markers in menu_views.h

---
 engines/mads/menu_views.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index c203248ad9..e22b6223a7 100644
--- a/engines/mads/menu_views.h
+++ b/engines/mads/menu_views.h
@@ -8,20 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-<<<<<<< HEAD
-
-=======
  *
->>>>>>> master
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-<<<<<<< HEAD
-
-=======
  *
->>>>>>> master
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3