summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary DeLaney2015-08-11 17:18:22 -0500
committerGary DeLaney2015-08-11 17:18:22 -0500
commitf705e8ae40a2d2962c1e496968adab0dd9b10459 (patch)
tree88b36d2c05d81d6c7d33ac2a668f17a4e3efd23f
parent48da534c43093780c21a8a06898ad16ba3380217 (diff)
downloadaur-f705e8ae40a2d2962c1e496968adab0dd9b10459.tar.gz
update
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 8f6517c290f1..6134bba1c205 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,8 +31,8 @@ pkgver() {
prepare() {
cd "$srcdir/${pkgname%-sl-git}"
- git merge origin/python_version
- git merge origin/gir_lookup
+ git merge --no-edit origin/python_version
+ git merge --no-edit origin/gir_lookup
}
build() {