summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfwhcat2019-05-02 23:22:22 +0200
committerfwhcat2019-05-02 23:22:22 +0200
commit9010828cde4a4992e308f4788267609b7ed28bfa (patch)
treee32ff1527869009b15ff1a2fbfa5bbb1d699a563
parentd2472873a1071d4aac6293c42fd5d9dc06542713 (diff)
parent3bf6bf84ccf3d8d29e3724514101c3fe9f9a24fe (diff)
downloadaur-9010828cde4a4992e308f4788267609b7ed28bfa.tar.gz
Oops conflicts & provides using -git package
-rw-r--r--PKGBUILD5
1 files changed, 5 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 94c01643578..73983f99d50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,13 @@ 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')