Removing conflict markers

2011-04-07 15:55:33 +12:00 · 2011-04-07 15:55:33 +12:00 · c649ed9257
parent 700de9664d
commit c649ed9257
1 changed files with 0 additions and 3 deletions
--- 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