diff options
Diffstat (limited to 'chrome/common/extensions')
| -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 --> |