diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-26 10:39:27 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 14:35:11 +0000 |
| commit | 39faf3ec60d771deeb5ef3fc67c16884b0b02c33 (patch) | |
| tree | f2dec6028b1f4be106652dfb1be66535059b1899 /chrome/common | |
| parent | a672feed31c3f4ce48d75bd8e8218d4736faa98d (diff) | |
| download | external_chromium-39faf3ec60d771deeb5ef3fc67c16884b0b02c33.zip external_chromium-39faf3ec60d771deeb5ef3fc67c16884b0b02c33.tar.gz external_chromium-39faf3ec60d771deeb5ef3fc67c16884b0b02c33.tar.bz2 | |
Merge Chromium at r66597: Fix strangeness in permission_warnings.html
Git seems to have got confused in the merge.
Change-Id: Ifb10f7f0d5c248270b42f1ac969a44216de9a65b
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/extensions/docs/permission_warnings.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/common/extensions/docs/permission_warnings.html b/chrome/common/extensions/docs/permission_warnings.html index 1d77c36..6d42386 100644 --- a/chrome/common/extensions/docs/permission_warnings.html +++ b/chrome/common/extensions/docs/permission_warnings.html @@ -95,11 +95,7 @@ <div> </div> </div> -<<<<<<< HEAD - </dl> -======= </dl> ->>>>>>> chromium.org at r66597 </div> </div> <!-- /SUBTEMPLATES --> |