Fix bug 1600 - checking for db user keystone creation

[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
-<<<<<<< HEAD
-nbi.charm
-.coverage*
-=======
 *.charm
 .coverage
 coverage.xml
->>>>>>> WIP: Improve osm charms
 .stestr
 cover
 release
\ No newline at end of file