[zanata/zanata-platform] 7003ea: fix: resolve merge conflicts, minor changes to TMX...

[GitHub]

  Branch: refs/heads/release-to-master-0618
  Home:   https://github.com/zanata/zanata-platform
  Commit: 7003ea99e4915070427273c7bb06fed7a7b55ede
      https://github.com/zanata/zanata-platform/commit/7003ea99e4915070427273c7bb06fed7a7b55ede
  Author: kgough <kgough at redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
    M server/zanata-frontend/src/app/entrypoint/index.js
    M server/zanata-frontend/src/app/styles/ant-theme-vars.less
    M server/zanata-frontend/src/app/styles/antd.less

  Log Message:
  -----------
  fix: resolve merge conflicts, minor changes to TMX modal styling



      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.