Fix merge artifacts (qmk#14146)

4pplet · Aug 24, 2021 · 622c3ca · 622c3ca
1 parent 2cade3a
commit 622c3ca
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 0 deletions.
diff --git a/keyboards/babyv/keymaps/melonbred/keymap.c → ...hdesigns/babyv/keymaps/melonbred/keymap.c b/keyboards/babyv/keymaps/melonbred/keymap.c → ...hdesigns/babyv/keymaps/melonbred/keymap.c
diff --git a/...rds/xd75/keymaps/replicaJunction/config.h → ...udi/xd75/keymaps/replicajunction/config.h b/...rds/xd75/keymaps/replicaJunction/config.h → ...udi/xd75/keymaps/replicajunction/config.h
diff --git a/...rds/xd75/keymaps/replicaJunction/keymap.c → ...udi/xd75/keymaps/replicajunction/keymap.c b/...rds/xd75/keymaps/replicaJunction/keymap.c → ...udi/xd75/keymaps/replicajunction/keymap.c
diff --git a/...ds/xd75/keymaps/replicaJunction/readme.md → ...di/xd75/keymaps/replicajunction/readme.md b/...ds/xd75/keymaps/replicaJunction/readme.md → ...di/xd75/keymaps/replicajunction/readme.md
diff --git a/...rds/xd75/keymaps/replicaJunction/rules.mk → ...udi/xd75/keymaps/replicajunction/rules.mk b/...rds/xd75/keymaps/replicaJunction/rules.mk → ...udi/xd75/keymaps/replicajunction/rules.mk