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

This commit is contained in:
QMK Bot 2023-04-02 04:32:04 +00:00
commit 9c72ea4373
3 changed files with 2 additions and 9 deletions

View File

@ -2,13 +2,6 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#ifndef KEYMAP_GERMAN
#define KEYMAP_GERMAN
#include "keymap.h"
#endif
//Tap Dance Declarations //Tap Dance Declarations
enum { enum {
TD_ESC_RUPT = 0 TD_ESC_RUPT = 0

View File

@ -18,7 +18,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "keymap.h" #include "keycodes.h"
/* Layer numbers shared across keymaps. */ /* Layer numbers shared across keymaps. */
enum user_layer { enum user_layer {

View File

@ -16,7 +16,7 @@
#pragma once #pragma once
#include "keymap.h" #include "keycodes.h"
// clang-format off // clang-format off