diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 7 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 1 insertions, 8 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 diff --git a/app/models/user.rb b/app/models/user.rb index 55ea60f..db65dc4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,7 +1,7 @@ class User < ActiveRecord::Base before_save { self.email = email.downcase } - before_save { self.user_name = user_name.downcase } + before_save { self.user_name = user_name } ## # Rails looks for the create_remember_token and runs the method |