diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/resources/conflicts | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/conflicts')
| -rw-r--r-- | chromium/chrome/browser/resources/conflicts/about_conflicts.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/chrome/browser/resources/conflicts/about_conflicts.html b/chromium/chrome/browser/resources/conflicts/about_conflicts.html index 83c277a0bbe..855f25c63ff 100644 --- a/chromium/chrome/browser/resources/conflicts/about_conflicts.html +++ b/chromium/chrome/browser/resources/conflicts/about_conflicts.html @@ -208,7 +208,7 @@ html[dir=rtl] .clearing { jsselect="moduleList" class="module"> <td valign="top" class="datacell"> <span dir="ltr" - jsvalues=".innerHTML:description" + jsvalues=".textContent:description" class="clearing nowrap"></span> </td> <td valign="top" class="datacell"> |