cleanup after merge

Author: tthbellcom

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();