summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ray2021-04-08 11:49:08 +1000
committerMatt Ray2021-04-08 12:20:43 +1000
commit3d9c64e2b9f566476d930769ca7193a512d66073 (patch)
treeb09642b302318d18f92470245b19e566e99f62db
parent8330ecdf4cc4092b89ae8295f43586c21ca56efe (diff)
downloadaur-3d9c64e2b9f566476d930769ca7193a512d66073.tar.gz
remove the chef-client conflict
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bf9ecd969236..07ba76e2f770 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,6 @@ pkgbase = chef-workstation
conflicts = chef-dk
conflicts = chef
conflicts = chef-solo
- conflicts = chef-client
conflicts = cinc
source = https://packages.chef.io/files/stable/chef-workstation/21.2.278/ubuntu/18.04/chef-workstation_21.2.278-1_amd64.deb
sha256sums = 6457062a347fe002d3452eccf18064f1e39ab7373a5618c06ab8e32ac6f32841
diff --git a/PKGBUILD b/PKGBUILD
index 1a095467bcac..c4f2985af867 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('x86_64')
url="https://downloads.chef.io/chef-workstation/"
license=('Apache')
depends=()
-conflicts=(chef-dk chef chef-solo chef-client cinc)
+conflicts=(chef-dk chef chef-solo cinc)
source=('https://packages.chef.io/files/stable/chef-workstation/21.2.278/ubuntu/18.04/chef-workstation_21.2.278-1_amd64.deb')
sha256sums=('6457062a347fe002d3452eccf18064f1e39ab7373a5618c06ab8e32ac6f32841')