Merge remote-tracking branch 'refs/remotes/origin/main' into funding_basket

# Conflicts:
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.ts

1 files changed, 3 insertions, 3 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 1dcebc5..31f2982 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
@@ -22,7 +22,7 @@ export class FundingBasketComponent implements
     private router: Router,
       private usersService: UsersService
   ) {}
-    
+
   ngOnInit(): void {
     if (!this.usersService.getCurrentUser()) {
       this.router.navigate(['/login'], {queryParams: {redir: this.router.url}});
@@ -47,7 +47,7 @@ export class FundingBasketComponent implements
   isInBasket(need: Need): boolean {
     return this.basket.some(n => n.id == need.id);
   }
-  
+
   addNeed(need: Need, quantity: number=1): void {
     if (this.user && !this.isInBasket(need)) {
       this.basket.push(need);
@@ -57,7 +57,7 @@ export class FundingBasketComponent implements
     }
       this.needCount++;
     }
-  
+
   removeNeed(need: Need, quantity:number=1): void {
     if (this.user && this.isInBasket(need)) {
       this.need_quantity[need.id] -= quantity;