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

diff --git a/.gitignore b/.gitignore
index 688e2cd8b..cb9c68d78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,9 +20,10 @@ classes
 .DS_STORE
 .metadata
 ordmodels/src/main/java
+tests/allure-report/
 tests/config.xml
 tests/models
-<<<<<<< HEAD
+tests/test-requirements.txt
 *.log
 *.log.*
 __pycache__
@@ -37,3 +38,6 @@ api/src/main/java/org/opendaylight/yang/gen/v1/gnpy/path/rev190502/AccumulatedMe
 # Sphinx documentation
 .tox/
 docs/_build/
+honeynode-simulator/
+pce/data
+pce/some-output