Permalink
Browse files

fix merge conflict

  • Loading branch information...
Robey Pointer
Robey Pointer committed May 22, 2012
1 parent de7eb70 commit ce4e26e9827cb53bb45126af3c240a479279d968
Showing with 0 additions and 1 deletion.
  1. +0 −1 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}}

0 comments on commit ce4e26e

Please sign in to comment.