summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-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() {