aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Loach2016-04-16 13:08:12 -0400
committerOri Avtalion2016-04-16 20:23:10 +0300
commitaa95183b93dcfaa74e0e732259c87e9b9d39d518 (patch)
treeadb0bbcf30edef990796a2925b3aded4d1439a04
parentd5e1a9562431720f20d4ab039e194dcc96b3d0ec (diff)
downloadscummvm-rg350-aa95183b93dcfaa74e0e732259c87e9b9d39d518.tar.gz
scummvm-rg350-aa95183b93dcfaa74e0e732259c87e9b9d39d518.tar.bz2
scummvm-rg350-aa95183b93dcfaa74e0e732259c87e9b9d39d518.zip
MADS: Remove git conflict markers in menu_views.h
-rw-r--r--engines/mads/menu_views.h8
1 files changed, 0 insertions, 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.