niggl/srumboard_frontend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix conflict in backend.service.ts

Browse Source
This commit is contained in:
Jakob Fahr 2020-07-06 21:59:22 +02:00
parent 4ca662c819
commit 8104f7641a
No known key found for this signature in database
GPG Key ID: 8873416D8E4CEF6B
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/services/backend.service.ts
View File

@ -246,15 +246,6 @@ export interface ScrumUserstory {
projectid?: number; projectid?: number;
} }
<<<<<<< HEAD
export interface ScrumSprint {
id?: number;
title: string;
description?: string;
startDate: Date;
endDate: Date;
project?: number;
=======
export interface ScrumSprint{ export interface ScrumSprint{
id?: number; id?: number;
title: string; title: string;
@ -262,7 +253,6 @@ export interface ScrumSprint{
startDate: string; startDate: string;
endDate: string; endDate: string;
project: number; project: number;
>>>>>>> feature/dashboard
} }
export interface ScrumCategory { export interface ScrumCategory {