summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD2
1 files changed, 1 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 6a5d7a6a6041..ccc6b2b881cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ depends=('java-environment>=7'
makedepends=()
optdepends=()
provides=()
-conflicts=()
+conflicts=(panoply-nodesktop)
replaces=()
backup=()
options=()