[Keyboard] updated a vendor name / fixed minor keymap issues (qmk#12881)

mechlovin · Jul 30, 2021 · e282f6e · e282f6e
1 parent 2d0d59c
commit e282f6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/keyboards/delikeeb/waaffle/rev3/rules.mk b/keyboards/delikeeb/waaffle/rev3/rules.mk
@@ -1,3 +1,4 @@
+
 # MCU name
 MCU = atmega32u4
 
@@ -21,4 +22,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = delikeeb/waaffle/rev3/pro_micro
+DEFAULT_FOLDER = delikeeb/waaffle/rev3/pro_micro
diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk
@@ -21,4 +21,8 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
+<<<<<<< HEAD:keyboards/handwired/split89/rules.mk
 SPLIT_KEYBOARD = yes
+=======
+DEFAULT_FOLDER = delikeeb/waaffle/rev3/pro_micro
+>>>>>>> d200e3de8e ([Keyboard] updated a vendor name / fixed minor keymap issues (#12881)):keyboards/delikeeb/waaffle/rev3/rules.mk