Merge commit 'ec7ba4f2dbae0901724483de5868127a1cbc38e9'

diff --cc packages/test-simple/Makefile.am
Simple merge

diff --cc packages/test-simple/copyright_exceptions
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/packages/test-simple/copyright_exceptions

diff --cc packages/test-simple/example/gcd.el
Simple merge

diff --cc packages/test-simple/example/test-gcd.el
Simple merge

diff --cc packages/test-simple/test-simple.el
Simple merge

diff --cc packages/test-simple/test/test-basic.el
Simple merge

diff --cc packages/test-simple/test/test-fns.el
Simple merge

diff --cc packages/test-simple/test/test-no-clear.el
Simple merge