From 2dec2184226a5d8adb3a24473932742a5724bfc8 Mon Sep 17 00:00:00 2001
From: Fredrik Oseberg <fredrik.no@gmail.com>
Date: Tue, 20 Apr 2021 19:21:49 +0200
Subject: [PATCH] chore: update changelog

---
 frontend/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/CHANGELOG.md b/frontend/CHANGELOG.md
index 29a55824cf..5bb8ff9823 100644
--- a/frontend/CHANGELOG.md
+++ b/frontend/CHANGELOG.md
@@ -17,9 +17,13 @@ The latest version of this document is always available in
 # 4.0.0-alpha.7
 - feat: add support for demo sign-in
 # 4.0.0-alpha.5
+<<<<<<< HEAD
 - fix: require ADMIN role to manage users
 - fix: add permissions for tag-types and project
 
+=======
+- feat: frontend should understand rbac permissions
+>>>>>>> chore: update changelog
 # 4.0.0-alpha.4
 - fix: overall bugs
 - feat: user flow