diff options
| author | Emina Ahmetovic <emina.ahmetovic@egiz.gv.at> | 2020-10-30 09:37:01 +0100 |
|---|---|---|
| committer | Emina Ahmetovic <emina.ahmetovic@egiz.gv.at> | 2020-10-30 09:37:01 +0100 |
| commit | cbaa725f4940ba0677feaa76a4556c1d9a14efc5 (patch) | |
| tree | a22a629d998ad61d6f5cbeec8b439245731ef4bf /pdf-as-lib/src/main | |
| parent | 7f66428916800f37fcc3ea67310d2ef73eb2fa38 (diff) | |
| parent | 587b3c52aff9eaca6f02279a5976aeeadf08c124 (diff) | |
| download | pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.gz pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.tar.bz2 pdf-as-4-cbaa725f4940ba0677feaa76a4556c1d9a14efc5.zip | |
resolving merge conflicts
Diffstat (limited to 'pdf-as-lib/src/main')
| -rw-r--r-- | pdf-as-lib/src/main/resources/config/config.zip | bin | 1276558 -> 1277365 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip Binary files differindex ebfeee02..495b3028 100644 --- a/pdf-as-lib/src/main/resources/config/config.zip +++ b/pdf-as-lib/src/main/resources/config/config.zip |