summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfwhcat2019-05-02 23:25:13 +0200
committerfwhcat2019-05-02 23:25:13 +0200
commita12b0957fb3e2c69c0c6dd66ce38734b0bdccd3f (patch)
tree3449e5abbb0142a06ef6630adab0baf896e9bf31
parent9010828cde4a4992e308f4788267609b7ed28bfa (diff)
downloadaur-a12b0957fb3e2c69c0c6dd66ce38734b0bdccd3f.tar.gz
can I do this properly? thanks Atom :@
-rw-r--r--PKGBUILD5
1 files changed, 0 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 73983f99d50..94c01643578 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,13 +11,8 @@ license=('GPL3')
makedepends=('git')
-<<<<<<< HEAD
provides=("${_pkgname}-git")
conflicts=("${_pkgname}-git")
-=======
-provides=("${pkgname}")
-conflicts=("${pkgname}")
->>>>>>> 3bf6bf84ccf3d8d29e3724514101c3fe9f9a24fe
source=("${_pkgname}::git+https://github.com/B00merang-Artwork/Windows-10.git")
sha256sums=('SKIP')