resolved conflicts

3 files changed, 80 insertions, 0 deletions

diff --git a/keyboards/hineybush/hineyg80/keymaps/wkl/config.h b/keyboards/hineybush/hineyg80/keymaps/wkl/config.h
new file mode 100644
index 0000000000..16e640d306
--- /dev/null
+++ b/keyboards/hineybush/hineyg80/keymaps/wkl/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2019 Josh Hinnebusch
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+// place overrides here
diff --git a/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
new file mode 100644
index 0000000000..a1255e9cc7
--- /dev/null
+++ b/keyboards/hineybush/hineyg80/keymaps/wkl/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2019 %YOUR_NAME%
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  QMKBEST = SAFE_RANGE,
+  QMKURL,
+  ______ = KC_TRNS,
+  XXXXXX = KC_NO
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ansi_150u_mods( /* Base */
+    KC_ESC,  KC_F1,    KC_F2,   KC_F3,  KC_F4,  KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,      KC_INS,   KC_HOME,   KC_PGUP,   KC_PSCR, 
+                                                                                   KC_DEL,   KC_END,    KC_PGDN,   KC_SLCK, 
+    KC_GRV,  KC_1,     KC_2,    KC_3,   KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NLCK,  KC_PSLS,   KC_PAST,   KC_PAUS, 
+    KC_TAB,  KC_Q,     KC_W,    KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_P7,    KC_P8,     KC_P9,     KC_PMNS,
+    KC_LCTL, KC_A,     KC_S,    KC_D,   KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,      KC_ENT,   KC_P4,    KC_P5,     KC_P6,     KC_PPLS, 
+    KC_LSFT,    KC_Z,    KC_X,   KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,     KC_P3,     KC_PENT, 
+    KC_LCTL,    KC_LALT,         KC_SPC,    MO(1),     KC_RCTL,                              KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,     KC_PDOT           
+    ),
+  [1] = LAYOUT_ansi_150u_mods( /* Fn */______,   ______,   ______,  ______, ______, ______,  ______,    ______,  ______,  ______,   ______,   ______,   ______,   KC_MPRV,   KC_MPLY,   KC_MNXT,    KC_VOLU,  
+                                                                          ______,    ______,    ______,     KC_VOLD,  
+    ______,   ______,   ______,  ______, ______, ______,  ______,  ______,  ______,  ______,  ______,   ______,   ______,   KC_DEL,   ______,    ______,    ______,     ______,  
+    ______,   ______,   ______,  ______, RESET , ______,  ______,  ______,  ______,  ______,  ______,   ______,   ______,   ______,   ______,    ______,    ______,     ______,  
+    KC_CAPS,  ______,   ______,  ______, ______, ______,  ______,  ______,  ______,  ______,  ______,    ______,   ______,   ______,    ______,    ______,     ______,  
+    ______,      ______,  ______, ______, ______,  ______,  ______,  ______,  ______,  ______,   ______,   ______,   ______,   ______,    ______,    ______,     ______,  
+    ______,      ______,          ______,  ______,    ______,                               ______,   ______,   ______,    ______,    ______          
+    ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
\ No newline at end of file
diff --git a/keyboards/hineybush/hineyg80/keymaps/wkl/readme.md b/keyboards/hineybush/hineyg80/keymaps/wkl/readme.md
new file mode 100644
index 0000000000..3e0d8343c7
--- /dev/null
+++ b/keyboards/hineybush/hineyg80/keymaps/wkl/readme.md
@@ -0,0 +1 @@
+# The default keymap for hineyg80
\ No newline at end of file