[zanata-commits] [zanata/zanata] bbf790: Fix bad merge

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: bbf7901163d044e81101edc96f2fad63e5ce38b2
      https://github.com/zanata/zanata/commit/bbf7901163d044e81101edc96f2fad63e5ce38b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-09-23 (Fri, 23 Sep 2011)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java

  Log Message:
  -----------
  Fix bad merge