diff options
author | Gary DeLaney | 2015-08-11 17:34:18 -0500 |
---|---|---|
committer | Gary DeLaney | 2015-08-11 17:34:18 -0500 |
commit | 9a850d67777abde23c9c9cfef1ee1cff78d11c31 (patch) | |
tree | ff91b7e4fb41a760c540786337112cdb8384bf28 /PKGBUILD | |
parent | f705e8ae40a2d2962c1e496968adab0dd9b10459 (diff) | |
download | aur-bake-sl-git.tar.gz |
update
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,7 +1,7 @@ # Maintainer: Gary DeLaney <gld1982ltd@gmail.com> _gitroot="git://github.com/semplice/bake.git" -_gitbranch="semplice" +_gitbranch="master" _gitname="bake" pkgname="$_gitname-sl-git" @@ -31,6 +31,7 @@ pkgver() { prepare() { cd "$srcdir/${pkgname%-sl-git}" + git merge --no-edit origin/semplice git merge --no-edit origin/python_version git merge --no-edit origin/gir_lookup } |