[zanata/zanata-server] 10a48e: fix(pom): fix the invalid merge

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 10a48eb049a50af28d1499edc9519a3d3d76941a
      https://github.com/zanata/zanata-server/commit/10a48eb049a50af28d1499edc9519a3d3d76941a
  Author: Ding-Yi Chen <dchen at redhat.com>
  Date:   2016-10-19 (Wed, 19 Oct 2016)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  fix(pom): fix the invalid merge