remove comments

library/Class/Indexation/PseudoNotice/UnimarcVisitor.php

@@ -262,8 +262,6 @@ class Class_Indexation_PseudoNotice_UnimarcVisitor extends Class_Indexation_Pseu
     return $this->unimarc->getFullRecord();
   }
 
-<<<<<<< HEAD
-=======
 
   protected function addUnimarcField($field, $indicators, $content) {
     // unimarc limit field size to 9999
@@ -272,5 +270,4 @@ class Class_Indexation_PseudoNotice_UnimarcVisitor extends Class_Indexation_Pseu
 
     $this->unimarc->add_field($field, $indicators, $content);
   }
->>>>>>> refs/remotes/origin/stable
 }