conflicts

Author: dcanar9

pom.xml

@@ -4,11 +4,7 @@
     <artifactId>api-audit</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
-<<<<<<< HEAD
-    <version>3.7.31-SNAPSHOT</version>
-=======
     <version>3.7.33-SNAPSHOT</version>
->>>>>>> 08ecbf57c4b88a7120a1122ae7e42c2bfe4def05
     <description>Hygieia Audit Rest API Layer</description>
     <url>https://github.com/Hygieia/${repository.name}</url>
 
@@ -46,17 +42,11 @@
     </parent>
 
     <properties>
-<<<<<<< HEAD
-        <repository.name>hygieia-auditapi-ace</repository.name>
-        <com.capitalone.dashboard.core.version>04.06.03.54</com.capitalone.dashboard.core.version>
-        <spring-security.version>5.5.7</spring-security.version>
-=======
         <repository.name>api-audit</repository.name>
 
         <!-- Dependencies -->
-        <com.capitalone.dashboard.core.version>3.15.45</com.capitalone.dashboard.core.version>
+        <com.capitalone.dashboard.core.version>4.0.1</com.capitalone.dashboard.core.version>
         <spring-security.version>4.2.18.RELEASE</spring-security.version>
->>>>>>> 08ecbf57c4b88a7120a1122ae7e42c2bfe4def05
         <spring.cloud.version>1.3.1.RELEASE</spring.cloud.version>
         <tomcat.version>9.0.65</tomcat.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>