Major improvement in OSM charms

[osm/devops.git] / installers / charm / nbi / .gitignore

diff --git a/installers/charm/nbi/.gitignore b/installers/charm/nbi/.gitignore
index 05bdb52..21a2062 100644 (file)
--- a/installers/charm/nbi/.gitignore
+++ b/installers/charm/nbi/.gitignore
@@ -1,4 +1,4 @@
-# Copyright 2020 Canonical Ltd.
+# Copyright 2021 Canonical Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -22,7 +22,14 @@
 venv
 .vscode
 build
+<<<<<<< HEAD
 nbi.charm
 .coverage*
+=======
+*.charm
+.coverage
+coverage.xml
+>>>>>>> WIP: Improve osm charms
 .stestr
-cover
\ No newline at end of file
+cover
+release
\ No newline at end of file