[zanata/zanata-platform] 1fdcae: ZNTA-1705 - remove ignore option from TM merge dia...

Branch: refs/heads/master Home: https://github.com/zanata/zanata-platform Commit: 1fdcaec4772cac16426df5f6337d6580ad916036 https://github.com/zanata/zanata-platform/commit/1fdcaec4772cac16426df5f6337d6580ad916036 Author: Patrick Huang Date: 2017-02-21 (Tue, 21 Feb 2017) Cha

[zanata/zanata-platform] 1fdcae: ZNTA-1705 - remove ignore option from TM merge dia...

Branch: refs/heads/ZNTA-1705-tm-merge Home: https://github.com/zanata/zanata-platform Commit: 1fdcaec4772cac16426df5f6337d6580ad916036 https://github.com/zanata/zanata-platform/commit/1fdcaec4772cac16426df5f6337d6580ad916036 Author: Patrick Huang Date: 2017-02-21 (Tue, 21 Feb