diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 17:15:05 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 17:15:05 +0000 |
| commit | 434171fd3e3d28404c66416a4c98d492ea975b3f (patch) | |
| tree | 5fa1d784fde9ab1cca28a8307fb9062f39bb8fa4 /chrome/browser/sync/resources | |
| parent | 1e2d1c3592e26ff43277b34fad848f6b3e98f17a (diff) | |
| download | chromium_src-434171fd3e3d28404c66416a4c98d492ea975b3f.zip chromium_src-434171fd3e3d28404c66416a4c98d492ea975b3f.tar.gz chromium_src-434171fd3e3d28404c66416a4c98d492ea975b3f.tar.bz2 | |
Fix line endings on merge_and_sync.html in repo, it is breaking svn.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/resources')
| -rw-r--r-- | chrome/browser/sync/resources/merge_and_sync.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/resources/merge_and_sync.html b/chrome/browser/sync/resources/merge_and_sync.html index b90713d..8af2fc1 100644 --- a/chrome/browser/sync/resources/merge_and_sync.html +++ b/chrome/browser/sync/resources/merge_and_sync.html @@ -27,7 +27,7 @@ function showMergeAndSyncDone() { var throbber = document.getElementById('throbber_container'); throbber.style.display = "none"; - document.getElementById("header").innerHTML =
+ document.getElementById("header").innerHTML = "<p><font size='-1'><b>" + templateData['alldone'] + "</b></font></p>"; document.getElementById("close").value = templateData['closelabel']; @@ -37,7 +37,7 @@ function showMergeAndSyncError() { var throbber = document.getElementById('throbber_container'); throbber.style.display = "none"; - document.getElementById("header").innerHTML =
+ document.getElementById("header").innerHTML = "<p><font size='-1'><b>" + templateData['setuperror'] + "</b></font></p>"; } |