resolved conflicts

1 files changed, 34 insertions, 0 deletions

diff --git a/keyboards/ut472/ut472.h b/keyboards/ut472/ut472.h
new file mode 100644
index 0000000000..1068dd7041
--- /dev/null
+++ b/keyboards/ut472/ut472.h
@@ -0,0 +1,34 @@
+/* Copyright 2018 Carlos Filoteo
+ *
+ * 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
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
+  K30, K31, K32, K33, K34,    K35,   K37, K38, K39, K3a, K3b  \
+) \
+  { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b }, \
+    { K30, K31, K32, K33, K34, K35, K35, K37, K38, K39, K3a, K3b }  \
+  }
+
+