summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary DeLaney2015-08-11 17:14:45 -0500
committerGary DeLaney2015-08-11 17:14:45 -0500
commit48da534c43093780c21a8a06898ad16ba3380217 (patch)
tree492daed2edd911869dfc69273cb06c6277d0c9f7
parentab514856e858b888846dce9d621ae7839794e527 (diff)
downloadaur-48da534c43093780c21a8a06898ad16ba3380217.tar.gz
update
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 0a20d03d4656..8f6517c290f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,8 +31,8 @@ pkgver() {
prepare() {
cd "$srcdir/${pkgname%-sl-git}"
- git merge python_version
- git merge gir_lookup
+ git merge origin/python_version
+ git merge origin/gir_lookup
}
build() {