Merge emacs-25 into master (using imerge)

[gnu-emacs] / test / src / keymap-tests.el

diff --git a/test/automated/keymap-tests.el b/test/src/keymap-tests.el
similarity index 100%
rename from test/automated/keymap-tests.el
rename to test/src/keymap-tests.el