diff options
author | climbalima <climbalima@users.noreply.github.com> | 2016-11-17 02:44:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-17 02:44:49 +0100 |
commit | b085a34506bc981a7c7cdb270b7786d6a4cbf985 (patch) | |
tree | 1baa4005ba9c498744a3bbb2257943dbd41036e0 /keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh | |
parent | 21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (diff) | |
download | qmk_firmware-b085a34506bc981a7c7cdb270b7786d6a4cbf985.tar.gz qmk_firmware-b085a34506bc981a7c7cdb270b7786d6a4cbf985.tar.xz |
fixed readme conflicts
Diffstat (limited to 'keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh')
0 files changed, 0 insertions, 0 deletions