From 622c3cac3ab8bc25d3cfec63702e295e0b16a49a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 24 Aug 2021 17:18:25 +0100 Subject: [PATCH] Fix merge artifacts (#14146) --- keyboards/{ => eyeohdesigns}/babyv/keymaps/melonbred/keymap.c | 0 .../xd75/keymaps/replicajunction}/config.h | 0 .../xd75/keymaps/replicajunction}/keymap.c | 0 .../xd75/keymaps/replicajunction}/readme.md | 0 .../xd75/keymaps/replicajunction}/rules.mk | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{ => eyeohdesigns}/babyv/keymaps/melonbred/keymap.c (100%) rename keyboards/{xd75/keymaps/replicaJunction => xiudi/xd75/keymaps/replicajunction}/config.h (100%) rename keyboards/{xd75/keymaps/replicaJunction => xiudi/xd75/keymaps/replicajunction}/keymap.c (100%) rename keyboards/{xd75/keymaps/replicaJunction => xiudi/xd75/keymaps/replicajunction}/readme.md (100%) rename keyboards/{xd75/keymaps/replicaJunction => xiudi/xd75/keymaps/replicajunction}/rules.mk (100%) diff --git a/keyboards/babyv/keymaps/melonbred/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c similarity index 100% rename from keyboards/babyv/keymaps/melonbred/keymap.c rename to keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c diff --git a/keyboards/xd75/keymaps/replicaJunction/config.h b/keyboards/xiudi/xd75/keymaps/replicajunction/config.h similarity index 100% rename from keyboards/xd75/keymaps/replicaJunction/config.h rename to keyboards/xiudi/xd75/keymaps/replicajunction/config.h diff --git a/keyboards/xd75/keymaps/replicaJunction/keymap.c b/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c similarity index 100% rename from keyboards/xd75/keymaps/replicaJunction/keymap.c rename to keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c diff --git a/keyboards/xd75/keymaps/replicaJunction/readme.md b/keyboards/xiudi/xd75/keymaps/replicajunction/readme.md similarity index 100% rename from keyboards/xd75/keymaps/replicaJunction/readme.md rename to keyboards/xiudi/xd75/keymaps/replicajunction/readme.md diff --git a/keyboards/xd75/keymaps/replicaJunction/rules.mk b/keyboards/xiudi/xd75/keymaps/replicajunction/rules.mk similarity index 100% rename from keyboards/xd75/keymaps/replicaJunction/rules.mk rename to keyboards/xiudi/xd75/keymaps/replicajunction/rules.mk