X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fnbi%2F.gitignore;h=2885df273aad15007d0d44a57c83983822887b9c;hb=53a09d8a21b6b4c2a3e17ce302c3aec4b220b040;hp=21a2062e8bf9e783d82f5939ab4e6d6b271084a9;hpb=49379ced23b5e344a773ce77ac9cb59c1864e19b;p=osm%2Fdevops.git

diff --git a/installers/charm/nbi/.gitignore b/installers/charm/nbi/.gitignore
index 21a2062e..2885df27 100644
--- 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