ignore git merge files (*.orig)

Signed-off-by: Luis Pinto <[email protected]>

Author: lu-pinto

.gitignore

@@ -8,6 +8,7 @@
 *.launch
 *.swp
 *.tokens
+*.orig
 .classpath
 .externalToolBuilders/
 .gradle/
@@ -40,4 +41,4 @@ data
 ssb-keys
 docs_warning
 io/org
-wallet.key
+wallet.key