Removing conflict markers
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 7 Apr 2011 03:55:33 +0000 (15:55 +1200)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Sat, 16 Apr 2011 17:18:33 +0000 (13:18 -0400)
commit39ea4a86794c4ffb56870ee5d2a60335a563fbcb
treea99d586c5d15b06579b8fa32922f41057039d1a2
parente9d0f2696e9a7d5b2e1ab86ffabe4af14450dfc4
Removing conflict markers
(cherry picked from commit c649ed9257d3c7f4d71f484d8ea6e2d5af2e48d7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
etc/zebradb/marc_defs/unimarc/biblios/record.abs