Merge "Upgrade to Argon SR2"

[ccsdk/parent.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index bd2cc03..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
@@ -18,6 +19,7 @@ workspace
 target
 target-ide
 MANIFEST.MF
+**/__pycache__
 
 ## Misc Ignores (OS specific etc) ##
 bin/