tree 29295d2d8e07a08e254e7854cb5d3e9df9e50fad
parent 62f14ed235aad7717d7536d661ec0f78ae1f3672
author Robert Ginda <rginda@chromium.org> 1394825352 -0700
committer Robert Ginda <rginda@chromium.org> 1394830058 +0000

hterm 1.33: Fix user-css merge lossage.

* A previous merge lost the user-css pref changes to hterm_terminal.js.

Change-Id: I79693dddb4ea9960ddf223f4f456a16173ad2d0b
Reviewed-on: https://chromium-review.googlesource.com/190068
Reviewed-by: Marvelous Marius <mschilder@chromium.org>
Commit-Queue: Marvelous Marius <mschilder@chromium.org>
Reviewed-by: Robert Ginda <rginda@chromium.org>
Tested-by: Robert Ginda <rginda@chromium.org>