diff options
| author | Jacob Thornton <[email protected]> | 2011-12-24 22:31:39 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-12-24 22:31:39 -0800 |
| commit | 076370f3f9076b177a1f9c8ba9f536faa1a58957 (patch) | |
| tree | 3f2c4c77667d1a666384123b5608187fe8c5508d /bootstrap.css | |
| parent | 04fee21121473606b425007f0d5cfd7853b1460b (diff) | |
| download | bootstrap-076370f3f9076b177a1f9c8ba9f536faa1a58957.tar.xz bootstrap-076370f3f9076b177a1f9c8ba9f536faa1a58957.zip | |
fix for linux
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bootstrap.css b/bootstrap.css index eb7b65678..333d6f04c 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. -<<<<<<< HEAD - * Date: Thu Dec 22 19:09:49 PST 2011 -======= - * Date: Wed Dec 21 18:38:56 CST 2011 ->>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c + * Date: Sat Dec 24 22:30:43 PST 2011 */ html, body { margin: 0; |