From: Marcin Koziej Date: Tue, 20 Dec 2011 10:16:31 +0000 (+0100) Subject: merged a conflict in dcparser fields X-Git-Tag: 1.7~181 X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/1f3e067b075c8c20609c4ebbada2c543f2717082?ds=inline;hp=--cc merged a conflict in dcparser fields --- 1f3e067b075c8c20609c4ebbada2c543f2717082 diff --cc librarian/dcparser.py index aacbdbe,4fd0f66..245cf92 --- a/librarian/dcparser.py +++ b/librarian/dcparser.py @@@ -163,10 -159,7 +163,9 @@@ class WorkInfo(object) Field( DCNS('source'), 'source_name', required=False), Field( DCNS('source.URL'), 'source_url', required=False), Field( DCNS('identifier.url'), 'url', WLURI), - - ) + Field( DCNS('rights.license'), 'license', required=False), + Field( DCNS('rights'), 'license_description'), + ) @classmethod def from_string(cls, xml):