summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hummel2022-07-10 21:13:03 -0700
committerDavid Hummel2022-07-10 21:13:03 -0700
commit6b0153de15826c903e22699e813e10a4ea5760da (patch)
tree0df35ecc2f533d3c9b7045d91641227522b70046
parent9908500b099a8fa9ae02574618489c685ee7058a (diff)
downloadaur-6b0153de15826c903e22699e813e10a4ea5760da.tar.gz
Adding apm to conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aa25ec549cdc..927e50a7554a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = atom-community-git
depends = libx11
depends = libxkbfile
conflicts = atom
+ conflicts = apm
source = git+https://github.com/atom-community/atom.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c474911307c2..89fed6ed3a3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="A hackable text editor for the 21st century, built on Electron, and bas
url="https://github.com/atom-community/atom"
arch=("x86_64")
-conflicts=("${_gitname}")
+conflicts=("${_gitname}" "apm")
depends=("libsecret" "libx11" "libxkbfile")