[zanata/zanata-platform] f29255: WIP: merge conflict modal inputs

[GitHub]

  Branch: refs/heads/ZNTA-38
  Home:   https://github.com/zanata/zanata-platform
  Commit: f29255a13200ea43088aec11a2abd6f0c6eaae48
      https://github.com/zanata/zanata-platform/commit/f29255a13200ea43088aec11a2abd6f0c6eaae48
  Author: Kathryn Gough <kgough at redhat.com>
  Date:   2017-12-04 (Mon, 04 Dec 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/editor/app.css
    M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
    A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.css
    R server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.less

  Log Message:
  -----------
  WIP: merge conflict modal inputs