Removing conflict markers

(cherry picked from commit c649ed9257d3c7f4d71f484d8ea6e2d5af2e48d7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
index e8e1576..f474f45 100644 (file)
--- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
@@ -80,10 +80,7 @@ melm 680$b           LC-call-number:s
 melm 680               LC-call-number
 #melm 001              Identifier-standard:w
 
-<<<<<<< HEAD
-=======
 melm 200$b      itype:w,itype:p
->>>>>>> (Bug 4049) Searching itemtypes returning noise
 
 #melm 100$9            Cross-Reference !:w