[svn r18572] Minor - fixing bug

17 years ago · 30994f31a3
parent 5b10b4e395
commit 30994f31a3
1 changed files with 1 additions and 6 deletions
--- a/main/inc/lib/fckeditor/repositories_config.php
+++ b/main/inc/lib/fckeditor/repositories_config.php
@ -1,9 +1,8 @@
-<<<<<<< .mine
 <?php

 /**
 * Aditional system config settings for document repositories, the Dokeos LMS
- * @author Juan Carlos Raña
+ * @author Juan Carlos Ra<EFBFBD>a
 * @since 31/December/2008
 */

@ -74,10 +73,6 @@ if (api_is_in_course())
 	}
 }

-?>
-=======
-<?php
-
 /**
 * Aditional system config settings for document repositories, the Dokeos LMS
 * @author Juan Carlos Ra<EFBFBD>a