summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/newskill.cpp5
1 files changed, 0 insertions, 5 deletions
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