Bump project to 2.0.0 and fix feature deployment

[transportpce.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 04e0228f4b233a88fe068eaa7154102450640b0b..688e2cd8ba0c0194f3c312d48193b2321bfe9873 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,19 @@ classes
 .metadata
 ordmodels/src/main/java
 tests/config.xml
-tests/models
\ No newline at end of file
+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/