From: moodler <moodler>
Date: Tue, 10 Oct 2006 07:43:19 +0000 (+0000)
Subject: Merged bogon fix from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2179989947ee9d8ec631dd69ea4b61b47c833190;p=moodle.git

Merged bogon fix from stable
---

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index dc8edc9c8f..3f4af44ecf 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -4385,7 +4385,6 @@ function forum_reset_course_form($course) {
     echo '</p>';
 }
 
-<<<<<<< lib.php
 
 /**
  * Converts a forum to use the Roles System
@@ -4614,4 +4613,4 @@ function forum_convert_to_roles($forum, $forummodid, $teacherroles=array(),
 
 
 
-?>
\ No newline at end of file
+?>