X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.gitignore;h=70b203cd9db267d997ef74c669fbb1132387c9ef;hb=a42f0622facd28922e10152929790fe5b0d0a11f;hp=8e3726427f8945aef83b90d98b37b975d6a18c06;hpb=1758ca951b5bdf5073bddd294d102849027d1da1;p=transportpce.git

diff --git a/.gitignore b/.gitignore
index 8e3726427..70b203cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+*.iml
 **/target
 bin/
 dist
@@ -20,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