[Keyboard] Add the Ciel (qmk#16816)

Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]>
Bastardkb · Jul 2, 2022 · 3eb4bbf · 3eb4bbf
1 parent 3c80f91
commit 3eb4bbf
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/keyboards/chickenman/ciel/ciel.h b/keyboards/chickenman/ciel/ciel.h
@@ -54,7 +54,11 @@
     k400, k401, k402,                   k407,                               k411, k413, k414  \
 ) { \
     { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014 }, \
+<<<<<<< HEAD
     { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  KC_NO, k114 }, \
+=======
+    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  KC_NO, k414 }, \
+>>>>>>> 8826a1dea5 ([Keyboard] Add the Ciel (#16816))
     { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO}, \
     { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  KC_NO, k313,  k314 }, \
     { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, KC_NO, k407,  KC_NO, KC_NO, KC_NO, k411,  KC_NO, k413,  k414 }  \