| commit | 4b1f84c742542cee07b2d94fa80ab874ccac7849 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <edwin.kempin@sap.com> | Fri Dec 06 08:56:11 2013 +0100 |
| committer | Edwin Kempin <edwin.kempin@sap.com> | Fri Dec 06 09:41:16 2013 +0100 |
| tree | 01e04c46fcd540ba91e1e21bbded0e750398852f | |
| parent | cc30d53ccd1ab577050c401f762d28991a409164 [diff] |
Display 'Merge Conflict' in changes tables in standard black font Users find the bold red font too distracting. Bug: issue 2299 Change-Id: Ia6a114c864930d03a1bd9c1234607b0a90b9d8c4 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>