Merge remote-tracking branch 'origin/master' into develop

1 files changed, 1 insertions, 7 deletions

diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c
index a071fb8c2e..965456e56c 100755
--- a/users/ericgebhart/ericgebhart.c
+++ b/users/ericgebhart/ericgebhart.c
@@ -22,12 +22,6 @@
 #include "action.h"
 #include "action_layer.h"
 #include "process_keycode/process_tap_dance.h"
-#include "keymap_bepo.h"
-
-float tone_copy[][2]            = SONG(SCROLL_LOCK_ON_SOUND);
-float tone_paste[][2]           = SONG(SCROLL_LOCK_OFF_SOUND);
-
-userspace_config_t userspace_config;
 
 // Add reconfigurable functions here, for keymap customization
 // This allows for a global, userspace functions, and continued
@@ -40,7 +34,7 @@ __attribute__ ((weak))
 void matrix_scan_keymap(void) {}
 
 __attribute__ ((weak))
-layer_state_t layer_state_set_keymap (layer_state_t state) {
+uint32_t layer_state_set_keymap (uint32_t state) {
   return state;
 }