From 057b4b2bfbc5ac0419e0e965647796c5eb569935 Mon Sep 17 00:00:00 2001
From: Thomas Thune Hansen <tth@bellcom.dk>
Date: Mon, 5 Aug 2013 14:04:05 +0200
Subject: [PATCH] cleanup after merge

---
 plugins/mm/os2web_edoc_esdh_mm.inc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/mm/os2web_edoc_esdh_mm.inc b/plugins/mm/os2web_edoc_esdh_mm.inc
index c2539a6..080661c 100644
--- 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();