Commit 68b6b30

committed

Merge branch 'master' of

ssh://[email protected]/culturegraph/metafacture-core.git Conflicts: pom.xml

2 parents 1dca5a4 + 06ca8db commit 68b6b30Copy full SHA for 68b6b30

7 files changed

+613

-555

lines changed

examples/marc21-to-edm
- MARC21-EDM.xml
pom.xml
src/main/java/org/culturegraph/mf
- framework
  - DefaultSender.java
- stream
  - converter
    - JDomDocumentToStream.java
    - StreamToJDomDocument.java
  - sink
    - XmlWriter.java
- util/tries
  - ACNode.java

7 files changed

+613

-555

lines changed

Comments

(0)