Commit e6b91e95 authored by estade@chromium.org's avatar estade@chromium.org

fix merge conflict between r124495 and r124470

BUG=none
TEST=tree

Review URL: https://chromiumcodereview.appspot.com/9570033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124496 0039d316-1c4b-4281-b951-d872f2087c98
parent 1d4e6e25
...@@ -151,11 +151,6 @@ ...@@ -151,11 +151,6 @@
<!-- TODO(csilv): Remove subpage-sheet-container-1 --> <!-- TODO(csilv): Remove subpage-sheet-container-1 -->
<div id="subpage-sheet-container-1" <div id="subpage-sheet-container-1"
class="subpage-sheet-container transparent" hidden> class="subpage-sheet-container transparent" hidden>
<div id="subpage-sheet-1" class="subpage-sheet">
<div class="subpage-sheet-contents">
<include src="advanced_options.html">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment