Resolve conflict in gitlab.yml.example

config/gitlab.yml.example

@@ -756,7 +756,6 @@ test:
     enabled: true
   lfs:
     enabled: false
-<<<<<<< HEAD
     # The location where LFS objects are stored (default: shared/lfs-objects).
     # storage_path: shared/lfs-objects
     object_store:
@@ -781,10 +780,6 @@ test:
         aws_access_key_id: AWS_ACCESS_KEY_ID
         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
         region: eu-central-1
-=======
-  artifacts:
-    path: tmp/tests/artifacts
->>>>>>> upstream/master
   gitlab:
     host: localhost
     port: 80