summaryrefslogtreecommitdiffstats
path: root/keyboards/tkc1800/keymaps/yanfali/config.h
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-26 02:13:19 +0100
committerAlex Ong <the.onga@gmail.com>2019-01-26 02:13:19 +0100
commitc9ba618654417ec115809a031d315f8327c79ad4 (patch)
treecd5b907af5bebde7062897ff847e473232ed1214 /keyboards/tkc1800/keymaps/yanfali/config.h
parent2bb2977c133646c4e056960e72029270d77cc1eb (diff)
parentd977daa8dc9136746425f9e1414e1f93cb161877 (diff)
downloadqmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.gz
qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.xz
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce. # Conflicts: # quantum/matrix.c
Diffstat (limited to 'keyboards/tkc1800/keymaps/yanfali/config.h')
-rw-r--r--keyboards/tkc1800/keymaps/yanfali/config.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/keyboards/tkc1800/keymaps/yanfali/config.h b/keyboards/tkc1800/keymaps/yanfali/config.h
index e5de001a5..f1390cb03 100644
--- a/keyboards/tkc1800/keymaps/yanfali/config.h
+++ b/keyboards/tkc1800/keymaps/yanfali/config.h
@@ -14,10 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
+#pragma once
//#define USE_I2C
//#define SSD1306OLED
@@ -25,5 +22,3 @@
#define SSD1306_ADDRESS 0x3C
// place overrides here
-
-#endif