Bump project to 2.0.0 and fix feature deployment

[transportpce.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8da0b1eec1fd8fe493716d9f31f59cabab2aaad4..688e2cd8ba0c0194f3c312d48193b2321bfe9873 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,18 @@ classes
 ordmodels/src/main/java
 tests/config.xml
 tests/models
-
+<<<<<<< HEAD
+*.log
+*.log.*
+__pycache__
+*.egg-info
+.eggs
+*.pyc
+*.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/
-