[zanata/zanata-server] cd9108: fix rebase error

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: cd9108b3dbc3c5433d055d408d4ef49b14fccd5e
      https://github.com/zanata/zanata-server/commit/cd9108b3dbc3c5433d055d408d4ef49b14fccd5e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy

  Log Message:
  -----------
  fix rebase error