fix conflicts.

2012-05-30 08:22:40 -05:00
parent d21713f35f c1de1d61d8
commit d1bb02ab64
7 changed files with 130 additions and 84 deletions
--- a/public/laravel/css/style.css
+++ b/public/laravel/css/style.css
@@ -166,7 +166,7 @@ div.home>h2 {
 .content table
 {
 	border-collapse:collapse
-	border:1px solid #eee;
+	border: 1px solid #eee;
 	width:100%;
 	line-height:1.5em;
 }