Merge

4 years ago · 45155a96cd
parent 9022d5824a cbd402db9b
commit 45155a96cd
1 changed files with 4 additions and 0 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -28,7 +28,11 @@ package-aur:
    - echo "Installing Arch"
    - pacman -Syu --noconfirm sudo base-devel openssh git openssl

+<<<<<<< HEAD
    # makepkg and .SRCINFO
+=======
+    # Make AUR package
+>>>>>>> cbd402db9b7004778c8b24264ddbba4b97edb24f
    - cd posy-cursors/
    - echo "makepkg"
    - sudo -u nobody makepkg -c