[zanata/zanata-platform] 7d73b1: fix(ZNTA-2136): Complete fixing merge conflicts

[GitHub]

  Branch: refs/heads/efloden/modal-notification/ZNTA-2136
  Home:   https://github.com/zanata/zanata-platform
  Commit: 7d73b1987c0864879cd6c059232446cc1d857921
      https://github.com/zanata/zanata-platform/commit/7d73b1987c0864879cd6c059232446cc1d857921
  Author: efloden <efloden at redhat.com>
  Date:   2017-08-11 (Fri, 11 Aug 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js

  Log Message:
  -----------
  fix(ZNTA-2136): Complete fixing merge conflicts