Update Asciidoctor build

2022-02-18 14:48:41 +00:00
parent 048395ecfc
commit 8b09042b5c
10 changed files with 198 additions and 46 deletions
@@ -1,6 +1,24 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
 build/
 .gradle/
 .classpath
 .project
 .settings/
 bin/
+<<<<<<< HEAD
+=======
+.gradle/
+build/
+>>>>>>> Setup buildsystem
+=======
+build/
+.gradle/
+.classpath
+.project
+.settings/
+bin/
+>>>>>>> changed Gradle wrapper to version 2.5
+=======
+.vscode/
+>>>>>>> update build.gradle