From fdae4d77dedb25c2c6b22f9e79714a0199333665 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke.madsen@geant.org>
Date: Wed, 3 Mar 2021 09:08:17 +0000
Subject: [PATCH] 0.2 changelog

---
 changelog.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 946f824..80f71dd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,9 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> release/0.1
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [0.2] - 2021-03-03
+- Generate and provision dashboards concurrently to reduce time to provision
+
 ## [0.1] - 2021-02-24
 - initial skeleton
-- 
GitLab