Resolve merge conflict

4 years ago · e7d1355dc1
parent 45155a96cd
commit e7d1355dc1
1 changed files with 1 additions and 5 deletions
--- 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