diff --git a/lib/weblib.php b/lib/weblib.php
index e7befa8a013..d2673addd14 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -34,11 +34,7 @@
  * - datalib.php - functions that access the database.
  * - moodlelib.php - general-purpose Moodle functions.
  * @author Martin Dougiamas
-<<<<<<< weblib.php
  * @version  $Id$
-=======
- * @version  $Id$
->>>>>>> 1.970.2.107
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  * @package moodlecore
  */