qmk_firmware

QMK firmware for my keyboards (Corne, Sweep Ferris) and trackball (Ploopy Adept)
Log | Files | Refs | Submodules | LICENSE
commit 847cca541c3666e687fc5ad6a0d3ba1733b89d81
parent 9cdccb12d112c13e79f127ca686bbe81b8fcef6f
Author: bri <284789+b-@users.noreply.github.com>
Date:   Sat, 16 Jul 2022 14:38:56 -0400

Add .orig to .gitignore (#17626)


Diffstat:

M.gitignore | 4++++


1 file changed, 4 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,10 @@
 .DS_Store
 ._*
 
+# Merge files
+*.orig
+*.rej
+
 # Build artifacts
 .clang_complete
 .build/