X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=.gitignore;h=70b203cd9db267d997ef74c669fbb1132387c9ef;hp=a8ddd2caab4b7bedf7992890d6114e3b594e8065;hb=9ad8ef509b97a3c8a4b14220c1c046a8a1171d2b;hpb=85e7fd69e1cffacae3ee6a088b14bcb9325578fa

diff --git a/.gitignore b/.gitignore
index a8ddd2caa..70b203cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+*.iml
 **/target
 bin/
 dist
@@ -11,9 +12,31 @@ target-ide
 .project
 .settings
 .idea
+.iml
 xtend-gen
 yang-gen-config
 yang-gen-sal
 classes
 .DS_STORE
 .metadata
+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/
+honeynode-simulator/
+pce/data
+pce/some-output