From e7d1355dc196167c5e3048c7eed3742894be477a Mon Sep 17 00:00:00 2001
From: Dmitry Porunov <dmitry@synh.me>
Date: Wed, 24 Jun 2020 20:07:29 +0300
Subject: [PATCH] Resolve merge conflict

---
 .gitlab-ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d3d885..18db55d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,11 +28,7 @@ package-aur:
     - echo "Installing Arch"
     - pacman -Syu --noconfirm sudo base-devel openssh git openssl
 
-<<<<<<< HEAD
-    # makepkg and .SRCINFO
-=======
-    # Make AUR package
->>>>>>> cbd402db9b7004778c8b24264ddbba4b97edb24f
+    # Makepkg and .SRCINFO
     - cd posy-cursors/
     - echo "makepkg"
     - sudo -u nobody makepkg -c