aboutsummaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
authorDasky <[email protected]>2024-07-20 23:49:20 +0100
committerGitHub <[email protected]>2024-07-20 23:49:20 +0100
commitd5cc00ab62361c35fa06e78cdfa1481d3194a089 (patch)
treead76a681611d50712fa20b3608bbd3a283b2ca33 /keyboards/merge
parent1e4435f22d038d77096d60ec4a61b74be3037140 (diff)
downloadqmk_firmware-d5cc00ab62361c35fa06e78cdfa1481d3194a089.tar.gz
qmk_firmware-d5cc00ab62361c35fa06e78cdfa1481d3194a089.zip
Remove instances of MASTER_LEFT. (#24163)
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/um70/config.h27
-rw-r--r--keyboards/merge/um80/config.h27
2 files changed, 26 insertions, 28 deletions
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 2d9f73d61a..5f999594cf 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -1,23 +1,22 @@
-/* Copyright 2021 duoshock
- *
- * 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
+/* Copyright 2021 duoshock
+ *
+ * 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
#define SPLIT_USB_DETECT
-#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
#define B6_AUDIO
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index d23f9163a7..d8e896c14b 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -1,23 +1,22 @@
-/* Copyright 2021 duoshock
- *
- * 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
+/* Copyright 2021 duoshock
+ *
+ * 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
#define SPLIT_USB_DETECT
-#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
#define AUDIO_PIN B6