diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
| commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
| tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /app/assets/stylesheets/search.css.scss | |
| parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
| parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'app/assets/stylesheets/search.css.scss')
| -rw-r--r-- | app/assets/stylesheets/search.css.scss | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/assets/stylesheets/search.css.scss b/app/assets/stylesheets/search.css.scss deleted file mode 100644 index 22fd394..0000000 --- a/app/assets/stylesheets/search.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the search controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ |