summaryrefslogtreecommitdiff
path: root/users/rossman360
diff options
context:
space:
mode:
authorRossman360 <53881724+Rossman360@users.noreply.github.com>2020-01-13 12:40:00 -0500
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-01-13 09:40:00 -0800
commit390a4fdc9d9a7c65c202d69eb40fbfcfcb070bb0 (patch)
tree23abbb8d841747bae69467df5e4883648a83914a /users/rossman360
parent1034df577d2931292802e00c61dc9133c67dcabd (diff)
[Keymap] fixed conflicts and made sure keymaps compiled, and some newer (older) keymaps snuck in (#7828)
* hope this works * Some new things crept in * remove nonsense config file * spacing fix * more spacing * quick revert of mysterious file * file revert take two * take three * take four * deleted unneeded lines * brought back not-unneeded line * whitespace delete
Diffstat (limited to 'users/rossman360')
-rw-r--r--users/rossman360/rossman360.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/users/rossman360/rossman360.h b/users/rossman360/rossman360.h
index e5629e20ed..9d6ee5981b 100644
--- a/users/rossman360/rossman360.h
+++ b/users/rossman360/rossman360.h
@@ -26,4 +26,3 @@ enum custom_keycodes {
PMERGE,
REMCAPS,
};
-