X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.gitignore;h=70b203cd9db267d997ef74c669fbb1132387c9ef;hb=007a7c53b32f289c795d1135c170a231ae4cbf67;hp=154143d976e382ce18f19c3159449809d0ced9c3;hpb=2ffcd18fd71cd69bb54c497212762e4714c62ded;p=transportpce.git

diff --git a/.gitignore b/.gitignore
index 154143d97..70b203cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+*.iml
 **/target
 bin/
 dist
@@ -11,6 +12,7 @@ target-ide
 .project
 .settings
 .idea
+.iml
 xtend-gen
 yang-gen-config
 yang-gen-sal
@@ -19,4 +21,22 @@ classes
 .metadata
 ordmodels/src/main/java
 tests/config.xml
-tests/models
\ No newline at end of file
+tests/models
+<<<<<<< HEAD
+*.log
+*.log.*
+__pycache__
+*.egg-info
+.eggs
+*.pyc
+*.swp
+nosetests.xml
+api/src/main/java
+api/src/main/java/org/opendaylight/yang/gen/v1/gnpy/path/rev190502/TeTpIdBuilder.java
+api/src/main/java/org/opendaylight/yang/gen/v1/gnpy/path/rev190502/AccumulatedMetricTypeBuilder.java
+# Sphinx documentation
+.tox/
+docs/_build/
+honeynode-simulator/
+pce/data
+pce/some-output