cleanup after merge

OS2WebCore · Aug 5, 2013 · 057b4b2 · 057b4b2
1 parent e2e92b5
commit 057b4b2
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/plugins/mm/os2web_edoc_esdh_mm.inc b/plugins/mm/os2web_edoc_esdh_mm.inc
@@ -79,13 +79,8 @@ function os2web_edoc_esdh_mm_import_meeting($meeting) {
   }
   $meetings = array();
   if (is_file(drupal_realpath($file))) {
-<<<<<<< HEAD
-
     libxml_use_internal_errors(true);
-=======
 
-    //libxml_use_internal_errors(true);
->>>>>>> balk_merge
     $manifest = simplexml_load_string(utf8_for_xml(file_get_contents(drupal_realpath($file))), 'SimpleXMLElement', LIBXML_NOWARNING); 
 
     libxml_clear_errors();