summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Harrison2023-07-12 10:01:27 -0400
committerMatt Harrison2023-07-12 10:01:27 -0400
commit0031617e71772bffcee1a80365edc4ec408542e5 (patch)
treea05d11da5aee5650e2e96dcf0dd5110b7aa66cd9
parentd10e5db7e20c7654ae0e0cbbba29517c17b17236 (diff)
downloadaur-headscale.tar.gz
Remove conflicts array
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3630dfa3cf1..f489ac68f714 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = headscale
depends = glibc
optdepends = wireguard-tools: CLI tools for generating keys
optdepends = postgresql: alternative database provider
- conflicts = headscale-git
backup = etc/headscale/config.yaml
backup = etc/headscale/derp.yaml
source = headscale-0.22.3.tar.gz::https://github.com/juanfont/headscale/archive/refs/tags/v0.22.3.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 1b0a4296e930..652c0f486f88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,6 @@ optdepends=(
'wireguard-tools: CLI tools for generating keys'
'postgresql: alternative database provider'
)
-conflicts=("${pkgname}-git")
backup=("etc/${pkgname}/config.yaml" "etc/${pkgname}/derp.yaml")
source=(