Created
March 24, 2015 16:44
-
-
Save TeriPastorino/362c8b2ced2efc5427e7 to your computer and use it in GitHub Desktop.
git diff ajax/glyphs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js | |
| index ad3eb2c..c5f2b04 100644 | |
| --- a/app/assets/javascripts/application.js | |
| +++ b/app/assets/javascripts/application.js | |
| @@ -13,6 +13,6 @@ | |
| //= require jquery | |
| //= require jquery_ujs | |
| //= require turbolinks | |
| -//= require bootstrap | |
| //= require bootstrap-sprockets | |
| +//= require bootstrap | |
| //= require_tree . | |
| diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb | |
| index 93e146a..9cdb83c 100644 | |
| --- a/app/controllers/items_controller.rb | |
| +++ b/app/controllers/items_controller.rb | |
| @@ -39,10 +39,8 @@ class ItemsController < ApplicationController | |
| end | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment