resolve conflict in pom after second master merge

palantir · Oct 5, 2018 · 14ff6fd · 14ff6fd
1 parent 44e04a3
commit 14ff6fd
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -166,12 +166,7 @@
     <scala.binary.version>2.11</scala.binary.version>
     <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
     <fasterxml.jackson.version>2.9.6</fasterxml.jackson.version>
-<<<<<<< HEAD
-    <fasterxml.jackson.databind.version>2.9.6</fasterxml.jackson.databind.version>
     <snappy.version>1.1.7.2</snappy.version>
-=======
-    <snappy.version>1.1.7.1</snappy.version>
->>>>>>> ab1650d2938db4901b8c28df945d6a0691a19d31
     <netlib.java.version>1.1.2</netlib.java.version>
     <calcite.version>1.2.0-incubating</calcite.version>
     <commons-codec.version>1.11</commons-codec.version>