From 3b1640986143b691bbafea814b32bbc9233ab009 Mon Sep 17 00:00:00 2001
From: heibaiying <31504331+heibaiying@users.noreply.github.com>
Date: Wed, 13 Feb 2019 17:58:41 +0800
Subject: [PATCH] Update README.md

---
 spring/springmvc-base/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spring/springmvc-base/README.md b/spring/springmvc-base/README.md
index 6378667..20e4dd5 100644
--- a/spring/springmvc-base/README.md
+++ b/spring/springmvc-base/README.md
@@ -940,5 +940,3 @@ public class RestfulController {
 }
 
 ```
-
->>>>>>> 719009b7e434876c2117d82a8a0cb31998acce33