diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 463ff054..23f3c2e4 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -2,10 +2,7 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
-<<<<<<< HEAD
- * SVN:         $Id$
-=======
->>>>>>> trunk
+ * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -27,11 +24,7 @@
  * @author    Uwe Tews
  * @author    Rodney Rehm
  * @package   Smarty
-<<<<<<< HEAD
- * @version   3.1-DEV
-=======
  * @version   3.1.22-dev
->>>>>>> trunk
  */
 
 /**
@@ -117,11 +110,8 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-<<<<<<< HEAD
-    const SMARTY_VERSION = 'Smarty-3.1.21';
-=======
     const SMARTY_VERSION = 'Smarty-3.1.22-dev/1';
->>>>>>> trunk
+
 
     /**
      * define variable scopes