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:
parent
45155a96cd
commit
e7d1355dc1
@ -28,11 +28,7 @@ package-aur:
|
|||||||
- echo "Installing Arch"
|
- echo "Installing Arch"
|
||||||
- pacman -Syu --noconfirm sudo base-devel openssh git openssl
|
- pacman -Syu --noconfirm sudo base-devel openssh git openssl
|
||||||
|
|
||||||
<<<<<<< HEAD
|
# Makepkg and .SRCINFO
|
||||||
# makepkg and .SRCINFO
|
|
||||||
=======
|
|
||||||
# Make AUR package
|
|
||||||
>>>>>>> cbd402db9b7004778c8b24264ddbba4b97edb24f
|
|
||||||
- cd posy-cursors/
|
- cd posy-cursors/
|
||||||
- echo "makepkg"
|
- echo "makepkg"
|
||||||
- sudo -u nobody makepkg -c
|
- sudo -u nobody makepkg -c
|
||||||
|
Loading…
Reference in New Issue
Block a user