Add .orig to .gitignore (qmk#17626)

jesperhellberg · Jul 16, 2022 · 847cca5 · 847cca5
1 parent 9cdccb1
commit 847cca5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,10 @@
 .DS_Store
 ._*
 
+# Merge files
+*.orig
+*.rej
+
 # Build artifacts
 .clang_complete
 .build/