Merge "Upgrade to Argon SR2"

[ccsdk/parent.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a905b3f..5bcfad2 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ org.eclipse.core.resources.prefs
 maven-eclipse.xml
 workspace
 .vscode
+*.orig
 
 ## Compilation Files ##
 *.class