Merge "Fix .gitmodules (use dublin instead of .)" into dublin

[oom.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3728761..96e76c1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ kubernetes/config/onap-parameters.yaml
 kubernetes/dist/*
 requirements.lock
 **/charts/*.tgz
+*.orig
 
 # AAI Schema
 **/schema/*
@@ -12,8 +13,13 @@ requirements.lock
 .classpath
 .factorypath
 .project
+.pydevproject
 .settings/
 
 # IntelliJ
 .idea/*
 *.iml
+
+# Mac OS
+*DS_Store*
+