[zanata/zanata-server] 130664: fix compile errors caused by merge conflict resolu...

[GitHub]

  Branch: refs/heads/merge-multi-file-upload
  Home:   https://github.com/zanata/zanata-server
  Commit: 1306648616408eb1b65499ebf6e44076e571f170
      https://github.com/zanata/zanata-server/commit/1306648616408eb1b65499ebf6e44076e571f170
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java

  Log Message:
  -----------
  fix compile errors caused by merge conflict resolution