2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

fixing conflict and recompiling

This commit is contained in:
Mark Otto
2011-09-16 09:47:36 -07:00
18 changed files with 61 additions and 67 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
/* Override some defaults */
html, body {
+1 -1
View File
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
+1 -1
View File
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;