1 files changed, 5 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index f31360a50d6c..73983f99d50b 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')