[zanata/zanata-platform] 71b6f7: feat(ZNTA-1736): move TODO comments that are causi...

[GitHub]

  Branch: refs/heads/ZNTA-1736-editorsettings
  Home:   https://github.com/zanata/zanata-platform
  Commit: 71b6f7444491ebe95a7d430c6d241fb114cc4d40
      https://github.com/zanata/zanata-platform/commit/71b6f7444491ebe95a7d430c6d241fb114cc4d40
  Author: David Mason <drdmason at gmail.com>
  Date:   2017-06-05 (Mon, 05 Jun 2017)

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

  Log Message:
  -----------
  feat(ZNTA-1736): move TODO comments that are causing a merge conflict