Resolve conflict

m-czernek · Jun 17, 2020 · 8a2134a · 8a2134a
1 parent 2d2faa1
commit 8a2134a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.iml
 target
 .secret
+dependency-reduced-pom.xml
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <jackson.version>2.9.10.3</jackson.version>
+    <jackson.version>2.9.10.4</jackson.version>
     <google.api.client.version>1.25.0</google.api.client.version>
     <google.cloud.pubsub.version>1.70.0</google.cloud.pubsub.version>
     <hibernate.version>4.3.6.Final</hibernate.version>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     *.iml
     target
     .secret
+    dependency-reduced-pom.xml