1
0
mirror of https://gitlab.com/ykkzde/posy-cursors synced 2024-10-27 20:44:10 +00:00

Resolve merge conflict

This commit is contained in:
Dmitry Porunov 2020-06-24 20:07:29 +03:00
parent 45155a96cd
commit e7d1355dc1

View File

@ -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