Fix packages conflict in gitlab.yml.example

config/gitlab.yml.example

@@ -209,7 +209,6 @@ production: &base
 
   ## Packages (maven repository so far)
   packages:
-<<<<<<< HEAD
     enabled: true
     # The location where build packages are stored (default: shared/packages).
     # storage_path: shared/packages
@@ -228,9 +227,6 @@ production: &base
         # endpoint: 'http://127.0.0.1:9000' # default: nil
         # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
         # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
-=======
-    enabled: false
->>>>>>> upstream/master
 
   ## GitLab Pages
   pages: