xc

efs-misc/pom.xml

@@ -47,6 +47,7 @@
             <artifactId>springfox-bean-validators</artifactId>
             <version>${swagger.version}</version>
         </dependency>
+<<<<<<< HEAD
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-core</artifactId>
@@ -62,6 +63,9 @@
             <artifactId>springfox-spring-web</artifactId>
             <version>2.8.0</version>
         </dependency>
+=======
+
+>>>>>>> eb6e809ff311fa302cf7af6a3b21d09580a0a579
     </dependencies>
 
     <build>