From 5a7e11e5f82a14872cd87209dd90b1707d9a4e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Thu, 3 Oct 2019 14:03:12 +0200
Subject: [PATCH] Fix merge

---
 .../creator/room-creator-page/room-creator-page.component.scss  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
index 7496116ee..f0fa4c755 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
@@ -69,8 +69,6 @@ mat-grid-list {
   margin-bottom: 20px !important;
 }
 
-
-
 mat-card-header {
   min-height: 80px;
   height: 10%!important;
-- 
GitLab