X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.gitignore;h=70b203cd9db267d997ef74c669fbb1132387c9ef;hb=4fc7683a8eefbd3121f6c90c1444394b91973e8a;hp=8da0b1eec1fd8fe493716d9f31f59cabab2aaad4;hpb=e6e13c5ba1221d74154c089ec95cd631950f1ef4;p=transportpce.git

diff --git a/.gitignore b/.gitignore
index 8da0b1eec..70b203cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,21 @@ 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/
-
+honeynode-simulator/
+pce/data
+pce/some-output