diff options
| author | zurgeg | 2023-10-27 14:44:34 -0400 |
|---|---|---|
| committer | zurgeg | 2023-10-27 14:44:34 -0400 |
| commit | b46cef1c9a896cdd63dabb92d9e5808ac3507aec (patch) | |
| tree | e81bfa636d2b8f2cf60cbba1bffed192f323661f /PKGBUILD | |
| parent | b2fd25ec5ca619a2d0c6e9bfa8676802df0f66c6 (diff) | |
| parent | 1a76b55f14f11d2f87f3f0a80d23209076346618 (diff) | |
| download | aur-b46cef1c9a896cdd63dabb92d9e5808ac3507aec.tar.gz | |
Fix merge conflict
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,8 +1,11 @@ +<<<<<<< HEAD # This is an example PKGBUILD file. Use this as a start to creating your own, # and remove these comments. For more information, see 'man PKGBUILD'. # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. +======= +>>>>>>> origin/master # Maintainer: Zurg Egg (k1hn3trj7@mozmail.com) pkgname=convolv2 pkgver=0.7.2 |