X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fng-ui%2F.gitignore;h=493739efb54d83d7a04116db3404a2b6042f4516;hb=ee303f97b9afe276076f56220d73c6382aa65c48;hp=ecfb4dc1be54fcc3f75789dff14c1972e82c782a;hpb=49379ced23b5e344a773ce77ac9cb59c1864e19b;p=osm%2Fdevops.git

diff --git a/installers/charm/ng-ui/.gitignore b/installers/charm/ng-ui/.gitignore
index ecfb4dc1..493739ef 100644
--- 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