projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update osm bundles to cs:osm-66 and cs:osm-ha-51
[osm/devops.git]
/
installers
/
charm
/
nbi
/
.gitignore
diff --git
a/installers/charm/nbi/.gitignore
b/installers/charm/nbi/.gitignore
index
21a2062
..
2885df2
100644
(file)
--- a/
installers/charm/nbi/.gitignore
+++ b/
installers/charm/nbi/.gitignore
@@
-22,14
+22,9
@@
venv
.vscode
build
venv
.vscode
build
-<<<<<<< HEAD
-nbi.charm
-.coverage*
-=======
*.charm
.coverage
coverage.xml
*.charm
.coverage
coverage.xml
->>>>>>> WIP: Improve osm charms
.stestr
cover
release
\ No newline at end of file
.stestr
cover
release
\ No newline at end of file