X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.gitignore;h=688e2cd8ba0c0194f3c312d48193b2321bfe9873;hb=de9c823434160ba713e598018cd1cfc09d8cbb08;hp=e8f60411edb576db798f9dff98d9a5dd7827655e;hpb=c1be1540990ac166e53743eb679d9243e79e9f80;p=transportpce.git

diff --git a/.gitignore b/.gitignore
index e8f60411e..688e2cd8b 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
@@ -20,3 +22,18 @@ classes
 ordmodels/src/main/java
 tests/config.xml
 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/