From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/TestController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/TestController.java b/src/main/java/com/moral/controller/TestController.java
index 3cc23e4..50f2fb0 100644
--- a/src/main/java/com/moral/controller/TestController.java
+++ b/src/main/java/com/moral/controller/TestController.java
@@ -16,7 +16,6 @@
@RequestMapping("/hello")
public String hello() {
-
return "Hello World";
}
--
Gitblit v1.8.0