feat(gitlab-ci): Correct little error in gitlab-ci

Correct little error in gitlab-ci

Signed-off-by: Jonathan Swaelens <swaelens.jonathan@opensides.be>

.gitlab-ci.yml

@@ -93,7 +93,6 @@ create_php_code_sniffer_rapport:
     - find . -type f -name '*.php' -o -name '*.inc' > ./filelist
     - phpcs --standard=../dev-tools/php-codesniffer-rules/FDStandard/ruleset.xml --file-list=./filelist
 
-<<<<<<< HEAD
 # Sonar publishing
 sonar_publish:
   image: sonar-cli:3.1.0.1141
@@ -129,26 +128,6 @@ sonar_preview:
       -D sonar.gitlab.ref_name="$CI_COMMIT_REF_NAME"
       -D sonar.analysis.mode=preview
 
-
-# generate man pages to test validity
-test_manpages:
-  stage: manpages
-  only:
-    - branches
-    - tags
-  before_script:
-  - apt-get update -qq
-  - apt-get install -y -qq perl man-db
-  script:
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-insert-schema contrib/man/fusiondirectory-insert-schema.1
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/bin/fusiondirectory-setup contrib/man/fusiondirectory-setup.1
-    - pod2man -c "FusionDirectory Documentation" -r "FusionDirectory 1.3" contrib/man/fusiondirectory.conf.pod contrib/man/fusiondirectory.conf.5
-    - lexgrog contrib/man/fusiondirectory-insert-schema.1
-    - lexgrog contrib/man/fusiondirectory-setup.1
-    - lexgrog contrib/man/fusiondirectory.conf.5
-
-=======
->>>>>>> e7172467... :sparkles: feat(gitlab-ci): Add manpage with lint
 # fusiondirectory-update-locale
 fusiondirectory-update-locale:
   stage: transifex