From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Thu, 7 Apr 2011 03:55:33 +0000 (+1200)
Subject: Removing conflict markers
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=c649ed9257d3c7f4d71f484d8ea6e2d5af2e48d7;p=koha.git

Removing conflict markers
---

diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
index e8e1576883..f474f45f7a 100644
--- 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