Fix 1473 and add vca_model_config_* to lcm charm

[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