fixed missed merge conflict

Author: janniclas

client/src/app/dashboard/table-all/table-all.component.ts

@@ -57,10 +57,7 @@ export class TableAllComponent implements OnInit {
     dataSource: MatTableDataSource<Instance> = new MatTableDataSource<Instance>(this.dataArray);
     data = new MatTableDataSource<Instance>();
     dialogResult: string;
-<<<<<<< HEAD
-=======
     expandedElement: Instance;
->>>>>>> develop
 
     constructor(public dialog: MatDialog, private apiService: ApiService, private modelService: ModelService) {
     }