Merge branch 'qmk-master'

keyboards/gmmk/pro/rev1/config.h

@@ -1,4 +1,12 @@
+<<<<<<< HEAD
 /* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+=======
+<<<<<<< HEAD:keyboards/quarkeys-chrisgve/z60/keymaps/via/config.h
+/* Copyright 2020 Nathan Spears
+=======
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:keyboards/gmmk/pro/rev1/config.h
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a
  *
  * 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
@@ -16,7 +24,18 @@
 
 #pragma once
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD:keyboards/quarkeys-chrisgve/z60/keymaps/via/config.h
+#define TAPPING_TOGGLE 2
+#define IOS_DEVICE_ENABLE
+=======
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a
 #include "config_common.h"
 
 /* SPI Config for LED Driver */
 #define SPI_DRIVER SPID1
+<<<<<<< HEAD
+=======
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:keyboards/gmmk/pro/rev1/config.h
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a

keyboards/kbdfans/kbd67/rev2/keymaps/chrisgve/config.h

@@ -1,4 +1,8 @@
+<<<<<<< HEAD:keyboards/kbdfans/kbd67/rev2/keymaps/chrisgve/config.h
 /* Copyright 2018 MechMerlin
+=======
+/* Copyright 2021 QMK
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:quantum/utf8.h
  *
  * 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
@@ -16,8 +20,14 @@
 
 #pragma once
 
+<<<<<<< HEAD:keyboards/kbdfans/kbd67/rev2/keymaps/chrisgve/config.h
 // place overrides here
 // #define FORCE_NKRO
 
 #define BACKLIGHT_CAPS_LOCK
 
+=======
+#include <stdint.h>
+
+const char *decode_utf8(const char *str, int32_t *code_point);
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:quantum/utf8.h

keyboards/quarkeys-chrisgve/z60/keymaps/via/config.h

@@ -1,4 +1,8 @@
+<<<<<<< HEAD:keyboards/quarkeys-chrisgve/z60/keymaps/via/config.h
 /* Copyright 2020 Nathan Spears
+=======
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:keyboards/gmmk/pro/rev1/config.h
  *
  * 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
@@ -16,5 +20,12 @@
 
 #pragma once
 
+<<<<<<< HEAD:keyboards/quarkeys-chrisgve/z60/keymaps/via/config.h
 #define TAPPING_TOGGLE 2
-#define IOS_DEVICE_ENABLE
+#define IOS_DEVICE_ENABLE
+=======
+#include "config_common.h"
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPID1
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:keyboards/gmmk/pro/rev1/config.h

quantum/utf8.h

@@ -1,4 +1,12 @@
+<<<<<<< HEAD
 /* Copyright 2021 QMK
+=======
+<<<<<<< HEAD:keyboards/kbdfans/kbd67/rev2/keymaps/chrisgve/config.h
+/* Copyright 2018 MechMerlin
+=======
+/* Copyright 2021 QMK
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:quantum/utf8.h
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a
  *
  * 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
@@ -16,6 +24,20 @@
 
 #pragma once
 
+<<<<<<< HEAD
+#include <stdint.h>
+
+const char *decode_utf8(const char *str, int32_t *code_point);
+=======
+<<<<<<< HEAD:keyboards/kbdfans/kbd67/rev2/keymaps/chrisgve/config.h
+// place overrides here
+// #define FORCE_NKRO
+
+#define BACKLIGHT_CAPS_LOCK
+
+=======
 #include <stdint.h>
 
-const char *decode_utf8(const char *str, int32_t *code_point);
+const char *decode_utf8(const char *str, int32_t *code_point);
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a:quantum/utf8.h
+>>>>>>> 6567b2168881ce8c47e38debcdc89eba1ac80c5a