From 8104f7641a5d95d84cf474a725f84321991f357a Mon Sep 17 00:00:00 2001
From: Jakob Fahr <me@jfhr.de>
Date: Mon, 6 Jul 2020 21:59:22 +0200
Subject: [PATCH] Fix conflict in backend.service.ts

---
 src/app/services/backend.service.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts
index 9889cda..11e1d0f 100644
--- a/src/app/services/backend.service.ts
+++ b/src/app/services/backend.service.ts
@@ -246,15 +246,6 @@ export interface ScrumUserstory {
   projectid?: number;
 }
 
-<<<<<<< HEAD
-export interface ScrumSprint {
-  id?: number;
-  title: string;
-  description?: string;
-  startDate: Date;
-  endDate: Date;
-  project?: number;
-=======
 export interface ScrumSprint{
     id?: number;
     title: string;
@@ -262,7 +253,6 @@ export interface ScrumSprint{
     startDate: string;
     endDate: string;
     project: number;
->>>>>>> feature/dashboard
 }
 
 export interface ScrumCategory {