From 0072fdd799ffe61bf64f12c23335da3adeb083e5 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 19 Mar 2019 12:57:40 -0700
Subject:  Cleanup Default Keymaps  (#5442)

* Cleanup Default Keymaps to conform to QMK Firmware standards

* Minor fixes

* Revert some changes
---
 keyboards/meira/keymaps/default/config.h | 7 ++-----
 keyboards/meira/keymaps/default/keymap.c | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'keyboards/meira/keymaps')

diff --git a/keyboards/meira/keymaps/default/config.h b/keyboards/meira/keymaps/default/config.h
index 5f5844a70..e3776d2ef 100644
--- a/keyboards/meira/keymaps/default/config.h
+++ b/keyboards/meira/keymaps/default/config.h
@@ -14,10 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
 
-#include "../../config.h"
+// place overrides here
 
 // place overrides here
 #define MUSIC_MASK (keycode != KC_NO)
@@ -30,5 +29,3 @@
                                   SONG(DVORAK_SOUND) \
                                 }
 #endif
-
-#endif
diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/meira/keymaps/default/keymap.c
index b25d78919..5703999a0 100644
--- a/keyboards/meira/keymaps/default/keymap.c
+++ b/keyboards/meira/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "meira.h"
+#include QMK_KEYBOARD_H
 #include "lighting.h"
 
 #ifdef RGBLIGHT_ENABLE
-- 
cgit v1.2.3-24-g4f1b