[zanata/zanata-platform] c4f1ed: fix: concurrent modal type error

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: c4f1ede89309506ec77a52e0cffb80c371c347ed
      https://github.com/zanata/zanata-platform/commit/c4f1ede89309506ec77a52e0cffb80c371c347ed
  Author: efloden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  fix: concurrent modal type error


  Commit: 64bff34a1a31cf29c72a267cbb9620ed46f0e628
      https://github.com/zanata/zanata-platform/commit/64bff34a1a31cf29c72a267cbb9620ed46f0e628
  Author: Earl Floden <efloden at redhat.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M server/zanata-frontend/src/app/editor/containers/MainContent.js

  Log Message:
  -----------
  Merge pull request #958 from zanata/fix-conflict-typeerror

fix: concurrent modal type error


Compare: https://github.com/zanata/zanata-platform/compare/0ba3e75ed30b...64bff34a1a31
      **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.