Merge remote-tracking branch 'origin/master' into develop

3 years ago · 9fa14655df
parent 580bcff4f6 847cca541c
commit 9fa14655df
1 changed files with 4 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,10 @@
 .DS_Store
 ._*

+# Merge files
+*.orig
+*.rej
+
 # Build artifacts
 .clang_complete
 .build/