fix merge conflict

twitter · May 22, 2012 · ce4e26e · ce4e26e
1 parent de7eb70
commit ce4e26e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/scrooge-generator/src/main/resources/javagen/service.java b/scrooge-generator/src/main/resources/javagen/service.java
@@ -22,7 +22,6 @@
 import com.twitter.finagle.stats.NullStatsReceiver;
 import com.twitter.finagle.stats.StatsReceiver;
 import com.twitter.finagle.thrift.ThriftClientRequest;
-import com.twitter.scrooge.FinagleThriftClient;
 import java.util.Arrays;
 import org.apache.thrift.TException;
 {{/finagleClient}}