diff options
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 566d05d..f705417 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -4,13 +4,10 @@ body { font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; -<<<<<<< HEAD -======= } h1, h2, h3, h4, h5{ color: #0f0f0f; ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b } p, ol, ul, td { @@ -74,9 +71,6 @@ div { list-style: square; } } -<<<<<<< HEAD -======= - hr { -moz-border-bottom-colors: none; -moz-border-image: none; @@ -102,4 +96,3 @@ hr { #footer{ text-align: center; } ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b |