[zanata/zanata-server] b4886d: Fix compilation error caused by merge

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: b4886dc915b197061bd5efa3d14b5f3db7c3f68e
      https://github.com/zanata/zanata-server/commit/b4886dc915b197061bd5efa3d14b5f3db7c3f68e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java

  Log Message:
  -----------
  Fix compilation error caused by merge