Format code according to conventions (qmk#16802)

thpoll83 · May 11, 2022 · aeef23f · aeef23f
1 parent b386d0c
commit aeef23f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/keyboards/eason/capsule65/keymaps/via/rules.mk b/keyboards/eason/capsule65/keymaps/via/rules.mk
@@ -1,7 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 =======
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 >>>>>>> 252b6271ff (add folders and capsule65 (#16687))
+=======
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+>>>>>>> c77d9b80d2 (Format code according to conventions (#16802))