repairing svnmerge prop
authorerickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Fri, 13 Jul 2007 18:56:58 +0000 (18:56 +0000)
committererickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Fri, 13 Jul 2007 18:56:58 +0000 (18:56 +0000)
commitd63de852f9fe17dc1c3ca1d784700c5663c4ddc0
treef7c22da0e0061076b9936eaf17b4ec1b48389dcd
parent6f7fdf6f1cfa0b2a4d5af174e9b3670d8b8b7964
repairing svnmerge prop

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/new-json2@1033 9efc2488-bf62-4759-914b-345cdb29e865