From 9f3615bb21946cfa17eaec83127fe9c42cb14a3d Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 22 Feb 2005 15:36:33 +0000
Subject: Please solve any merge conflicts before committing.

---
 src/gui/newskill.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src')

diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
index e5d8c365..2cceaaca 100644
--- a/src/gui/newskill.cpp
+++ b/src/gui/newskill.cpp
@@ -17,13 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-<<<<<<< newskill.cpp
- * 
- *  $Id$
-=======
  *
  *  $Id$
->>>>>>> 1.4
  */
 
  /* This file implements the new skill dialog for use under the latest
-- 
cgit v1.2.3-60-g2f50