From 2c55d926c9187a216f26c30ad386248804b049be Mon Sep 17 00:00:00 2001
From: Thomas Peetz <thomas.peetz@cimt-ag.de>
Date: Fri, 18 Feb 2022 15:52:14 +0100
Subject: [PATCH] fix .gitlab.ci.yml

---
 .gitlab-ci.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4363a61..67eb4f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,9 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Import sources
 Create Application:
   stage: build
   script: 
     - chmod +x gradlew
     - ./gradlew build
 
-<<<<<<< HEAD
-=======
->>>>>>> update build.gradle
-=======
->>>>>>> Import sources
 Create Documentation:
   stage: build
   script: 
@@ -20,10 +11,6 @@ Create Documentation:
     - ./gradlew asciidoctor
   artifacts:
     paths:
-<<<<<<< HEAD
-      - build/asciidoc/pdf/generations.pdf
-
-=======
       - build/docs/asciidocPdf/generations.pdf
 
 Build Library:
@@ -31,4 +18,3 @@ Build Library:
   script:
     - chmod +x gradlew
     - ./gradlew publish
->>>>>>> update build.gradle