Support 2x resoruce in about_conflicts.html

Support 2x resoruce in about_conflicts.html

BUG=None

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271568

[Evan Stade, 2014-05-19 18:24:30]

lgtm

[oshima, 2014-05-19 19:02:31]

The CQ bit was checked by oshima@chromium.org

[commit-bot: I haz the power, 2014-05-19 19:03:08]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/oshima@chromium.org/286933003/40001

[commit-bot: I haz the power, 2014-05-19 22:11:26]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-05-20 00:56:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-20 00:56:22]

Try jobs failed on following builders:
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[oshima, 2014-05-20 02:45:58]

The CQ bit was checked by oshima@chromium.org

[commit-bot: I haz the power, 2014-05-20 02:46:14]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/oshima@chromium.org/286933003/40001

[commit-bot: I haz the power, 2014-05-20 04:23:26]

Change committed as 271568