diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | merge-with-testing | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sun Mar 5 22:26:08 UTC 2017 +# Sun Mar 5 22:27:40 UTC 2017 pkgbase = linux-mainline pkgver = 4.11rc1 pkgrel = 1 diff --git a/merge-with-testing b/merge-with-testing index 6bf61e7aba10..0abe94aca6c8 100644 --- a/merge-with-testing +++ b/merge-with-testing @@ -20,6 +20,6 @@ grep ^pkgrel PKGBUILD git checkout master echo "Automerging configs" -git checkout merge -- config config.x86_64 +git checkout merge -- config.i686 config.x86_64 echo "All done, you can now do git checkout --patch merge PKGBUILD" |