Merge pull request #21 from yankee42/fixup-pr20-merge-conflicts

Browse Source

Fixed conflicts between new directory layout and PR #20

...

This commit is contained in:

Jochen Staerk

2017-05-25 10:07:52 +02:00

committed by GitHub

parent 94cffe543a b95f212c6a

commit 8eb6ccdcae

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

mustang/src/main/java/org/mustangproject/ZUGFeRD/PDFAConformanceLevel.java → src/main/java/org/mustangproject/ZUGFeRD/PDFAConformanceLevel.java

0

mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java → src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java