Merged bogon fix from stable

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index dc8edc9c8f72b852592c51f94be7da8fe4280283..3f4af44ecfb11e424dafe508c0bab08a8d37d578 100644 (file)
--- 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
+?>