diff options
| author | climbalima <climbalima@users.noreply.github.com> | 2016-11-14 23:08:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-14 23:08:10 -0500 |
| commit | bce6e52391da7c5f620c96a91857940f0dee19df (patch) | |
| tree | b2c83c7718443b57f3ef993a9d03b24ee21bf611 /keyboards/ergodox_ez/keymaps/software_neo2 | |
| parent | dd22c787b8b417df109d2136c76ce496dd7b93e3 (diff) | |
fixed conflict
Diffstat (limited to 'keyboards/ergodox_ez/keymaps/software_neo2')
0 files changed, 0 insertions, 0 deletions