Merge pull request #14 from jackhumbert/master

Merged from jackhumbert/qmk_firmware

diff --git a/keyboards/ergodox/keymaps/win10_writers-block/Makefile b/keyboards/ergodox/keymaps/win10_writers-block/Makefile
deleted file mode 100644 (file)
index fbab4b7..0000000
--- a/keyboards/ergodox/keymaps/win10_writers-block/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Having a file like this allows you to override Makefile definitions
-# for your own particular keymap
-
-TAP_DANCE_ENABLE=yes
-
-
-ifndef QUANTUM_DIR
-       include ../../../../Makefile
-endif

diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png
deleted file mode 100644 (file)
index d1cb198..0000000
Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/base-layer.png and /dev/null differ

diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png
deleted file mode 100644 (file)
index c2019da..0000000
Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/media-layer.png and /dev/null differ

diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png
deleted file mode 100644 (file)
index f866d3d..0000000
Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/rimworld-layer.png and /dev/null differ

diff --git a/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png b/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png
deleted file mode 100644 (file)
index 6f49aae..0000000
Binary files a/keyboards/ergodox/keymaps/win10_writers-block/images/symbol-layer.png and /dev/null differ