summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 306939336498..922e19392362 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,6 @@ pkgbase = google-cloud-sdk
license = Apache
depends = python2
optdepends = python2-crcmod: [gsutil] verify the integrity of GCS object contents
- conflicts = google-cloud-sdk-minimal
options = !strip
options = staticlibs
source = https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/google-cloud-sdk_214.0.0.orig.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index d58bb1c9ee1c..c54382652e4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,6 @@ pkgdesc="A set of command-line tools for the Google Cloud Platform. Includes gcl
url="https://cloud.google.com/sdk/"
license=("Apache")
arch=('x86_64')
-conflicts=("google-cloud-sdk-minimal")
depends=('python2')
optdepends=('python2-crcmod: [gsutil] verify the integrity of GCS object contents')
options=('!strip' 'staticlibs')