summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Sferrazza2017-03-01 21:43:10 -0500
committerKyle Sferrazza2017-03-01 21:43:10 -0500
commit941b007490736e41282b65e41683504a2fc97150 (patch)
tree623398cc42f111e1299fa527d955bfc152e32c3e
parent9286c833f079c94d5c654578b421ef8a05e1e4d7 (diff)
downloadaur-941b007490736e41282b65e41683504a2fc97150.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd67aa03040..6d9bba3b676 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,7 @@ pkgbase = powershell
depends = bash
depends = icu55
provides = powershell
- conflicts = powershell
+ conflicts = powershell-git
source = powershell::git+https://github.com/PowerShell/PowerShell.git#tag=v6.0.0-alpha.16
source = pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop
source = googletest::git+https://github.com/google/googletest.git
diff --git a/PKGBUILD b/PKGBUILD
index 6795f1a4bf7..c14a7a5e57a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="https://github.com/PowerShell/PowerShell"
license=('MIT')
makedepends=('git' 'cmake' 'proot' 'dotnet')
depends=('bash' 'icu55')
-conflicts=('powershell')
+conflicts=('powershell-git')
provides=('powershell')
source=($pkgname::git+https://github.com/PowerShell/PowerShell.git#tag=v$_pkgver
pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop