Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Complement documentation with OTN data
[transportpce.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 1c5724bbe95b749b81e65e561588596c98fc965a..688e2cd8ba0c0194f3c312d48193b2321bfe9873 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-22,6
+22,7
@@
classes
ordmodels/src/main/java
tests/config.xml
tests/models
ordmodels/src/main/java
tests/config.xml
tests/models
+<<<<<<< HEAD
*.log
*.log.*
__pycache__
*.log
*.log.*
__pycache__
@@
-31,7
+32,8
@@
__pycache__
*.swp
nosetests.xml
api/src/main/java
*.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/
# Sphinx documentation
.tox/
docs/_build/
-