projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Bug 1841: LTS Support
[osm/devops.git]
/
installers
/
charm
/
ng-ui
/
.gitignore
diff --git
a/installers/charm/ng-ui/.gitignore
b/installers/charm/ng-ui/.gitignore
index
ecfb4dc
..
493739e
100644
(file)
--- a/
installers/charm/ng-ui/.gitignore
+++ b/
installers/charm/ng-ui/.gitignore
@@
-22,16
+22,9
@@
venv
.vscode
build
-<<<<<<< HEAD
-ng-ui.charm
-.stestr
-.coverage*
-cover/
-=======
*.charm
.coverage
coverage.xml
.stestr
cover
release
->>>>>>> WIP: Improve osm charms