summaryrefslogtreecommitdiffstats
path: root/webkit/data/dom_serializer/note.xml
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-01 22:31:35 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-01 22:31:35 +0000
commitde56f378336660dcc848763c80267a5e063ae47d (patch)
tree7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/data/dom_serializer/note.xml
parentdc4f63c80cb90efe594131030aad6776e5945fcc (diff)
downloadchromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip
chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz
chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data/dom_serializer/note.xml')
-rw-r--r--webkit/data/dom_serializer/note.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/data/dom_serializer/note.xml b/webkit/data/dom_serializer/note.xml
index 472f038..cef4920 100644
--- a/webkit/data/dom_serializer/note.xml
+++ b/webkit/data/dom_serializer/note.xml
@@ -3,5 +3,5 @@
<to>&lt;Johnny&gt;</to>
<from>&lt;Boss&gt;</from>
<heading>Reminder</heading>
-<body>Get &quot;review&quot; and &apos;check&apos; in code!</body>
+<body>Get "review" and 'check' in code!</body>
</note> \ No newline at end of file