X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.gitignore;h=cb9c68d78e0d7418340a22203eacc1fdd1113ce4;hb=d5d2a9e9756c2dc6a296c0ee37cb67ae2f05fae2;hp=70b203cd9db267d997ef74c669fbb1132387c9ef;hpb=c5ee7ece362c83facd80fd30ff8796defdd7ebd3;p=transportpce.git

diff --git a/.gitignore b/.gitignore
index 70b203cd9..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__