merge conflict fixes

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">

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

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)',
+          backgroundColor: 'rgba(0, 86, 145, 1)'
-          pointRadius: 4,
-          pointHoverRadius: 7
         }]
       },
       options: {