| Index: chrome/browser/resources/about_conflicts.js
|
| diff --git a/chrome/browser/resources/about_conflicts.js b/chrome/browser/resources/about_conflicts.js
|
| index e8eb92ea557131d30b6dc87642165ee3174706b6..4c7ab365389d1dc127a42b6cf816826f60041b61 100644
|
| --- a/chrome/browser/resources/about_conflicts.js
|
| +++ b/chrome/browser/resources/about_conflicts.js
|
| @@ -7,11 +7,10 @@
|
| * expects to correctly populate the page.
|
| */
|
| var moduleListDataFormat = {
|
| - 'moduleList': [
|
| - {
|
| + 'moduleList': [{
|
| 'type': 'The type of module found',
|
| 'type_description':
|
| - 'The type of module (string), defaults to blank for regular modules',
|
| + 'The type of module (string), defaults to blank for regular modules',
|
| 'status': 'The module status',
|
| 'location': 'The module path, not including filename',
|
| 'name': 'The name of the module',
|
| @@ -22,8 +21,7 @@ var moduleListDataFormat = {
|
| 'recommended_action': 'The help tips bitmask',
|
| 'possible_resolution': 'The help tips in string form',
|
| 'help_url': 'The link to the Help Center article'
|
| - }
|
| -]
|
| + }]
|
| };
|
|
|
| /**
|
|
|