summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnathan Jenkins2016-02-01 10:42:59 -0800
committerJohnathan Jenkins2016-02-01 10:42:59 -0800
commite778cdf88059bc74364d3bd37bc71976384aef6b (patch)
tree51a16a5725985c69a96a2a6c9c4234e185f13861
parent15929646d62c2f1fe9a50e51933bcd5697ee046e (diff)
downloadaur-e778cdf88059bc74364d3bd37bc71976384aef6b.tar.gz
fix conflict
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 857d2f62d99..0c5a3a9786e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Feb 1 18:28:52 UTC 2016
+# Mon Feb 1 18:42:48 UTC 2016
pkgbase = googler
pkgdesc = Google Search from command line
pkgver = 2.1
@@ -8,9 +8,9 @@ pkgbase = googler
arch = any
license = GPL3
depends = python
- conflicts = google-cli-git
+ conflicts = googler-git
source = https://github.com/jarun/google-cli/archive/v2.1.tar.gz
- md5sums = 52856e7bb93ed2d40c8c1be5bfb56ea1
+ md5sums = 1329218e1331546861cf64b30ac5fe39
pkgname = googler
diff --git a/PKGBUILD b/PKGBUILD
index d946fe34635..6cc52adb0ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('any')
url="https://github.com/jarun/google-cli"
license=('GPL3')
depends=('python')
-conflicts=('google-cli-git')
+conflicts=('googler-git')
source=("https://github.com/jarun/google-cli/archive/v$pkgver.tar.gz")
md5sums=('1329218e1331546861cf64b30ac5fe39')