Fix merge issue with WireHopperTest

opendistro-for-elasticsearch · Jul 16, 2020 · a8865b5 · a8865b5
1 parent 6372f70
commit a8865b5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.../java/com/amazon/opendistro/elasticsearch/performanceanalyzer/rca/net/WireHopperTest.java b/.../java/com/amazon/opendistro/elasticsearch/performanceanalyzer/rca/net/WireHopperTest.java
@@ -1,9 +1,6 @@
 package com.amazon.opendistro.elasticsearch.performanceanalyzer.rca.net;
 
-<<<<<<< HEAD
 import com.amazon.opendistro.elasticsearch.performanceanalyzer.AppContext;
-=======
->>>>>>> d84454b... Add full mutual auth to gRPC client/server and augment tests
 import com.amazon.opendistro.elasticsearch.performanceanalyzer.grpc.FlowUnitMessage;
 import com.amazon.opendistro.elasticsearch.performanceanalyzer.net.GRPCConnectionManager;
 import com.amazon.opendistro.elasticsearch.performanceanalyzer.net.NetClient;