remove dangling lines of merge conflict

Author: Melissa You

LICENSE-binary

@@ -316,15 +316,12 @@ org.apache.commons:commons-lang3:3.12.0
 org.apache.commons:commons-math3:3.1.1
 org.apache.commons:commons-text:1.10.0
 org.apache.commons:commons-validator:1.6
-<<<<<<< HEAD
 org.apache.curator:curator-client:4.2.0
 org.apache.curator:curator-framework:4.2.0
 org.apache.curator:curator-recipes:4.2.0
-=======
 org.apache.curator:curator-client:5.2.0
 org.apache.curator:curator-framework:5.2.0
 org.apache.curator:curator-recipes:5.2.0
->>>>>>> ccfa072dc77 (HADOOP-17612. Upgrade Zookeeper to 3.6.3 and Curator to 5.2.0 (#3241))
 org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1
 org.apache.hbase:hbase-annotations:1.4.8
 org.apache.hbase:hbase-client:1.4.8