1 files changed, 0 insertions, 16 deletions
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
index a6ee8fc..42015fe 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
@@ -1,17 +1,10 @@
 import {Component, OnInit} from '@angular/core';
 import {User} from '../../models/User';
-<<<<<<< HEAD
 import { UsersService } from '../../services/users.service';
 import { Need } from '../../models/Need';
 import { NeedListComponent } from '../need-list/need-list.component';
 import { Router } from '@angular/router';
 import { CupboardService } from '../../services/cupboard.service';
-=======
-import {UsersService} from '../../services/users.service';
-import {Need} from '../../models/Need';
-import {NeedListComponent} from '../need-list/need-list.component';
-import {Router} from '@angular/router';
->>>>>>> 1dd36e3643f646443555554d6de024653373fc8f
 
 @Component({
     selector: 'app-funding-basket',
@@ -45,15 +38,6 @@ export class FundingBasketComponent implements
     this.getBasketNeeds();
   }
 
-  getBasketNeeds(): void {
-    if (this.user && this.needs) {
-      this.needs.forEach(need => {
-        if (this.isInBasket(need)){
-          this.basket.push(need);
-        }
-        this.user = this.usersService.getCurrentUser()
-    }
-
     getBasketNeeds(): void {
         if (this.user && this.user.basket) {
             this.user.basket.forEach(need => {