From bfa3dc5a0ce8845b8b8fb459a0726b01f3c9d0ee Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Fri, 25 Sep 2015 10:25:47 -0400
Subject: [PATCH] Fix merge error

---
 .../java/org/elasticsearch/ExceptionSerializationTests.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
index d9b25d82322..7da0da82cca 100644
--- a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
+++ b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
@@ -20,6 +20,7 @@ package org.elasticsearch;
 
 import com.fasterxml.jackson.core.JsonLocation;
 import com.fasterxml.jackson.core.JsonParseException;
+
 import org.apache.lucene.util.Constants;
 import org.codehaus.groovy.runtime.typehandling.GroovyCastException;
 import org.elasticsearch.action.FailedNodeException;
@@ -59,12 +60,7 @@ import org.elasticsearch.index.engine.CreateFailedEngineException;
 import org.elasticsearch.index.engine.IndexFailedEngineException;
 import org.elasticsearch.index.engine.RecoveryEngineException;
 import org.elasticsearch.index.mapper.MergeMappingException;
-<<<<<<< HEAD
-import org.elasticsearch.index.query.TestParsingException;
-=======
-import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.index.query.QueryShardException;
->>>>>>> master
 import org.elasticsearch.index.shard.IllegalIndexShardStateException;
 import org.elasticsearch.index.shard.IndexShardState;
 import org.elasticsearch.index.shard.ShardId;