summarylogtreecommitdiffstats
diff options
context:
space:
mode:
author5chdn2016-03-03 20:42:44 +0100
committer5chdn2016-03-03 20:42:44 +0100
commitce9826ea4e998a3b9afc68b5949772ecca6b3d51 (patch)
tree1ce7c202757335c0cf6603931fcf4b53fea81e2b
parent25e07bfdeac07b25c250826043c1ee62faed24d6 (diff)
parent76cca63f3021f1cc93313450340a99f8b24678ba (diff)
downloadaur-ce9826ea4e998a3b9afc68b5949772ecca6b3d51.tar.gz
Merge master
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 21c29f21d9c1..fc222321f434 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,7 @@ pkgbase = geth-git
conflicts = geth-git
conflicts = go-ethereum
conflicts = go-ethereum-git
- source = geth-git::git+https://github.com/ethereum/go-ethereum.git
+ source = geth-git::git+https://github.com/ethereum/go-ethereum.git#branch=develop
sha256sums = SKIP
pkgname = geth-git
diff --git a/PKGBUILD b/PKGBUILD
index 6922fd7c3baf..31769456852f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ conflicts=(
'go-ethereum-git'
)
provides=('geth')
-source=("${pkgname}::git+https://github.com/ethereum/go-ethereum.git")
+source=("${pkgname}::git+https://github.com/ethereum/go-ethereum.git#branch=develop")
sha256sums=('SKIP')
pkgver() {