X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=.gitignore;h=70b203cd9db267d997ef74c669fbb1132387c9ef;hb=8d3c52f42c45987cdd8328cd918ca56f3400c016;hp=04e0228f4b233a88fe068eaa7154102450640b0b;hpb=efa75ab7d361f444d32bf1da93b21382abd2fbe0;p=transportpce.git

diff --git a/.gitignore b/.gitignore
index 04e0228f4..70b203cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,22 @@ 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/
+honeynode-simulator/
+pce/data
+pce/some-output