From 14ff6fd46d5c3b2eddb0f36daaf23c9e2f076630 Mon Sep 17 00:00:00 2001
From: Steven Rand <srand@palantir.com>
Date: Fri, 5 Oct 2018 22:18:19 +1000
Subject: [PATCH] resolve conflict in pom after second master merge

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index a11a06e6fc710..9f27b9e095391 100644
--- 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>