diff --git a/pom.xml b/pom.xml index 54e80c7f8..de8c37fa9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <<<<<<< HEAD ======= - + >>>>>>> f825992acb26c01f1af53305343a9ee693b4da2b org.springframework.boot