Fix compilation issues with merge
This commit is contained in:
@@ -6,10 +6,10 @@
|
||||
#include "keymap_spanish.h"
|
||||
#include "keymap_hungarian.h"
|
||||
#include "keymap_swedish.h"
|
||||
#include "keymap_br_abnt2.h"
|
||||
#include "keymap_brazilian_abnt2.h"
|
||||
#include "keymap_canadian_multilingual.h"
|
||||
#include "keymap_german_ch.h"
|
||||
#include "keymap_jp.h"
|
||||
#include "keymap_swiss_de.h"
|
||||
#include "keymap_japanese.h"
|
||||
|
||||
#define KC_MAC_UNDO LGUI(KC_Z)
|
||||
#define KC_MAC_CUT LGUI(KC_X)
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
#include "keymap_spanish.h"
|
||||
#include "keymap_hungarian.h"
|
||||
#include "keymap_swedish.h"
|
||||
#include "keymap_br_abnt2.h"
|
||||
#include "keymap_brazilian_abnt2.h"
|
||||
#include "keymap_canadian_multilingual.h"
|
||||
#include "keymap_german_ch.h"
|
||||
#include "keymap_jp.h"
|
||||
#include "keymap_swiss_de.h"
|
||||
#include "keymap_japanese.h"
|
||||
|
||||
#define KC_MAC_UNDO LGUI(KC_Z)
|
||||
#define KC_MAC_CUT LGUI(KC_X)
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
#include "keymap_spanish.h"
|
||||
#include "keymap_hungarian.h"
|
||||
#include "keymap_swedish.h"
|
||||
#include "keymap_br_abnt2.h"
|
||||
#include "keymap_brazilian_abnt2.h"
|
||||
#include "keymap_canadian_multilingual.h"
|
||||
#include "keymap_german_ch.h"
|
||||
#include "keymap_jp.h"
|
||||
#include "keymap_swiss_de.h"
|
||||
#include "keymap_japanese.h"
|
||||
|
||||
#define KC_MAC_UNDO LGUI(KC_Z)
|
||||
#define KC_MAC_CUT LGUI(KC_X)
|
||||
|
||||
Reference in New Issue
Block a user