From 31a9f22c6f70d97b41504bf96a83278aeb26759a Mon Sep 17 00:00:00 2001
From: "Ruben Hartenstein (PEA4-Fe)" <Ruben.Hartenstein@de.bosch.com>
Date: Mon, 18 Jan 2021 13:56:47 +0100
Subject: [PATCH] merge conflict fixes

---
 src/app/home/home.component.html | 5 +----
 src/app/home/home.component.scss | 3 ---
 src/app/home/home.component.ts   | 4 +---
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index b37924b..837a6dd 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -7,14 +7,11 @@
 <div *ngIf="login.isLoggedIn">
     <rb-form-multi-select name="groupSelect" idField="id" [items]="keys" [(ngModel)]="isActiveKey" label="Groups" class="selection">
         <span *rbFormMultiSelectOption="let key">{{key.id}}</span>
-<<<<<<< HEAD
+
     </rb-form-multi-select> 
     <rb-icon-button icon="forward-right" mode="primary" (click)="updateGroups(isActiveKey)">
         Apply groups 
     </rb-icon-button>
-=======
-    </rb-form-multi-select>
->>>>>>> bdce6912108211cbde87033003ce8143ba7c173e
 
     <div id="divChart">
         <canvas id="myChart">
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss
index 0c7d1c7..5e61e69 100644
--- a/src/app/home/home.component.scss
+++ b/src/app/home/home.component.scss
@@ -7,13 +7,10 @@ app-login {
   float: right;
 }
 
-<<<<<<< HEAD
 .selection{
   float: left;
   width: 20%;
 }
-=======
 rb-form-multi-select {
   width: 20%;
 }
->>>>>>> bdce6912108211cbde87033003ce8143ba7c173e
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index fff1acd..336c907 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -124,9 +124,7 @@ export class HomeComponent implements OnInit {
         datasets: [{
           label: 'Number of samples per group',
           data: [],
-          backgroundColor: 'rgba(0, 86, 145, 1)',
-          pointRadius: 4,
-          pointHoverRadius: 7
+          backgroundColor: 'rgba(0, 86, 145, 1)'
         }]
       },
       options: {