[Scummvm-cvs-logs] scummvm master -> aa95183b93dcfaa74e0e732259c87e9b9d39d518

[salty-horse]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
aa95183b93 MADS: Remove git conflict markers in menu_views.h


Commit: aa95183b93dcfaa74e0e732259c87e9b9d39d518
    https://github.com/scummvm/scummvm/commit/aa95183b93dcfaa74e0e732259c87e9b9d39d518
Author: Rob Loach (robloach at gmail.com)
Date: 2016-04-16T20:23:10+03:00

Commit Message:
MADS: Remove git conflict markers in menu_views.h

Changed paths:
    engines/mads/menu_views.h



diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index c203248..e22b622 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.