X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.gitignore;h=cb9c68d78e0d7418340a22203eacc1fdd1113ce4;hb=f2d880c000de212be9868dbdaf9c8beab7a81045;hp=4b372bd4bf2c8e5c2f08bcbd465dd84107dc3e97;hpb=96d112bd194f0f39f3d79cc8d76af7594b42f37d;p=transportpce.git

diff --git a/.gitignore b/.gitignore
index 4b372bd4b..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__
@@ -38,3 +39,5 @@ api/src/main/java/org/opendaylight/yang/gen/v1/gnpy/path/rev190502/AccumulatedMe
 .tox/
 docs/_build/
 honeynode-simulator/
+pce/data
+pce/some-output