summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-03-04 17:46:05 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-03-04 17:46:05 -0500
commit6d48e4641520ce03796e5b9edd258f704cee3e82 (patch)
tree11aa910b35236934febedb96e5584b7875705dd8 /app/assets
parent3d4d23e01ff17245cd87e1a8d008b1d7840f16d0 (diff)
Changed some username validation stuff
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss7
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