From 390a4fdc9d9a7c65c202d69eb40fbfcfcb070bb0 Mon Sep 17 00:00:00 2001
From: Rossman360 <53881724+Rossman360@users.noreply.github.com>
Date: Mon, 13 Jan 2020 12:40:00 -0500
Subject: [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
---
 users/rossman360/rossman360.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'users/rossman360')

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,
 };
-
-- 
cgit v1.2.3