Merge branch 'master' of github.com:Rayman2200/PDFA3
Conflicts: .gitignore
This commit is contained in:
14
.gitignore
vendored
14
.gitignore
vendored
@@ -1,5 +1,9 @@
|
||||
/target
|
||||
/.project
|
||||
/.classpath
|
||||
/.settings
|
||||
/PDFA*.pdf
|
||||
.project
|
||||
.classpath
|
||||
.settings/
|
||||
PDFA*.pdf
|
||||
target/
|
||||
pom.xml.tag
|
||||
pom.xml.releaseBackup
|
||||
pom.xml.next
|
||||
release.properties
|
||||
|
||||
Reference in New Issue
Block a user