Upgrade lighty to Chlorine

[transportpce.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 70b203cd9db267d997ef74c669fbb1132387c9ef..cb9c68d78e0d7418340a22203eacc1fdd1113ce4 100644 (file)
--- 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__