Resolve merge conflict
This commit is contained in:
		
							parent
							
								
									45155a96cd
								
							
						
					
					
						commit
						e7d1355dc1
					
				| @ -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 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user