Commit 6ec1abc5 authored by Jacob Thornton's avatar Jacob Thornton

Merge branch 'master' of github.com:twitter/bootstrap

parents f2e15402 a7134dbf
...@@ -636,7 +636,7 @@ ...@@ -636,7 +636,7 @@
<tr> <tr>
<td><code>&lt;pre class="prettyprint"&gt;</code></td> <td><code>&lt;pre class="prettyprint"&gt;</code></td>
<td> <td>
<p>Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting.</p> <p>Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting.</p>
<pre class="prettyprint">&lt;div&gt; <pre class="prettyprint">&lt;div&gt;
&lt;h1&gt;Heading&lt;/h1&gt; &lt;h1&gt;Heading&lt;/h1&gt;
&lt;p&gt;Something right here...&lt;/p&gt; &lt;p&gt;Something right here...&lt;/p&gt;
......
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