[zanata/zanata-platform] 0a33a0: feat(ZNTA-1736): reverse conflicting refactor line

[GitHub]

  Branch: refs/heads/ZNTA-1736-editorsettings
  Home:   https://github.com/zanata/zanata-platform
  Commit: 0a33a0dda6fde4dfd94dba4ea16cbc7d046b81f2
      https://github.com/zanata/zanata-platform/commit/0a33a0dda6fde4dfd94dba4ea16cbc7d046b81f2
  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): reverse conflicting refactor line