diff --git a/pom.xml b/pom.xml index de8c37fa9..271f72143 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,8 @@ ======= + + >>>>>>> f825992acb26c01f1af53305343a9ee693b4da2b org.springframework.boot