diff options
| author | Joel Challis <git@zvecr.com> | 2021-08-24 17:18:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 17:18:25 +0100 |
| commit | 622c3cac3ab8bc25d3cfec63702e295e0b16a49a (patch) | |
| tree | 31762fa1e0f950932e9b7befe99673d86bb59f83 /keyboards | |
| parent | 2cade3a48300e0709f8aec68602faf90947b6738 (diff) | |
| download | qmk_firmware-622c3cac3ab8bc25d3cfec63702e295e0b16a49a.tar.gz qmk_firmware-622c3cac3ab8bc25d3cfec63702e295e0b16a49a.zip | |
Fix merge artifacts (#14146)
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c (renamed from keyboards/babyv/keymaps/melonbred/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/xiudi/xd75/keymaps/replicajunction/config.h (renamed from keyboards/xd75/keymaps/replicaJunction/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c (renamed from keyboards/xd75/keymaps/replicaJunction/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/xiudi/xd75/keymaps/replicajunction/readme.md (renamed from keyboards/xd75/keymaps/replicaJunction/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/xiudi/xd75/keymaps/replicajunction/rules.mk (renamed from keyboards/xd75/keymaps/replicaJunction/rules.mk) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/keyboards/babyv/keymaps/melonbred/keymap.c b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c index ea62241e9d..ea62241e9d 100644 --- a/keyboards/babyv/keymaps/melonbred/keymap.c +++ b/keyboards/eyeohdesigns/babyv/keymaps/melonbred/keymap.c diff --git a/keyboards/xd75/keymaps/replicaJunction/config.h b/keyboards/xiudi/xd75/keymaps/replicajunction/config.h index a02f9a95db..a02f9a95db 100644 --- a/keyboards/xd75/keymaps/replicaJunction/config.h +++ b/keyboards/xiudi/xd75/keymaps/replicajunction/config.h diff --git a/keyboards/xd75/keymaps/replicaJunction/keymap.c b/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c index 71ef2a6683..71ef2a6683 100644 --- a/keyboards/xd75/keymaps/replicaJunction/keymap.c +++ b/keyboards/xiudi/xd75/keymaps/replicajunction/keymap.c diff --git a/keyboards/xd75/keymaps/replicaJunction/readme.md b/keyboards/xiudi/xd75/keymaps/replicajunction/readme.md index 980a2f7272..980a2f7272 100644 --- a/keyboards/xd75/keymaps/replicaJunction/readme.md +++ b/keyboards/xiudi/xd75/keymaps/replicajunction/readme.md diff --git a/keyboards/xd75/keymaps/replicaJunction/rules.mk b/keyboards/xiudi/xd75/keymaps/replicajunction/rules.mk index 7e0b3c9cac..7e0b3c9cac 100644 --- a/keyboards/xd75/keymaps/replicaJunction/rules.mk +++ b/keyboards/xiudi/xd75/keymaps/replicajunction/rules.mk |