Skip to content

S
service-campaign
Commit 521c3d94 authored by Nguyen Ha's avatar Nguyen Ha
Browse files
Options

merges code

parent fdb0ef94
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
pom.xml
View file @ 521c3d94
...@@ -183,7 +183,6 @@ ...@@ -183,7 +183,6 @@
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
</dependency> </dependency>
<<<<<<< Updated upstream
<dependency> <dependency>
<groupId>org.modelmapper</groupId> <groupId>org.modelmapper</groupId>
...@@ -202,8 +201,6 @@ ...@@ -202,8 +201,6 @@
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<version>3.17</version> <version>3.17</version>
</dependency> </dependency>
=======
>>>>>>> Stashed changes
<dependency> <dependency>
<groupId>com.cronutils</groupId> <groupId>com.cronutils</groupId>
<artifactId>cron-utils</artifactId> <artifactId>cron-utils</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment