From aa9225641a7b048d7b8d2e91bfa7f745ade1e6ce Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Fri, 14 Jun 2019 12:08:49 +0300
Subject: [PATCH] fixed issue from merge conflict
---
src/app.service.ts | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/app.service.ts b/src/app.service.ts
index 7263d33..927d7cc 100644
--- a/src/app.service.ts
+++ b/src/app.service.ts
@@ -1,4 +1,8 @@
import { Injectable } from '@nestjs/common';
@Injectable()
-export class AppService {}
+export class AppService {
+ getHello(): string {
+ return 'Hello World!';
+ }
+}
--
GitLab