Update README.md

2019-02-13 17:58:41 +08:00
parent 9d4aab9118
commit 3b16409861
1 changed files with 0 additions and 2 deletions
--- a/spring/springmvc-base/README.md
+++ b/spring/springmvc-base/README.md
@@ -940,5 +940,3 @@ public class RestfulController {
 }

 ```
-
->>>>>>> 719009b7e434876c2117d82a8a0cb31998acce33