X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=.gitignore;h=70b203cd9db267d997ef74c669fbb1132387c9ef;hp=1c5724bbe95b749b81e65e561588596c98fc965a;hb=9ad8ef509b97a3c8a4b14220c1c046a8a1171d2b;hpb=b90fdacec82f92e07d14ed1df31e3fe53275c676

diff --git a/.gitignore b/.gitignore
index 1c5724bbe..70b203cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ classes
 ordmodels/src/main/java
 tests/config.xml
 tests/models
+<<<<<<< HEAD
 *.log
 *.log.*
 __pycache__
@@ -31,7 +32,11 @@ __pycache__
 *.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