diff options
| author | Mikael Eriksson | 2017-03-05 23:27:40 +0100 |
|---|---|---|
| committer | Mikael Eriksson | 2017-03-05 23:27:40 +0100 |
| commit | a0815150c4a3b5955128192227c6b3f9dc78b11d (patch) | |
| tree | 9525212cd09870a79640c342b920310e1773eff9 | |
| parent | eaa5f43e1f522c04b82dd4ef270ae6a5f9eadfcc (diff) | |
| download | aur-a0815150c4a3b5955128192227c6b3f9dc78b11d.tar.gz | |
Change config filename
| -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" |