fixed conflict

This commit is contained in:
Senad Uka
2015-02-01 05:22:25 +01:00
10 changed files with 178 additions and 48 deletions

View File

@@ -0,0 +1,5 @@
class AddImageToCategories < ActiveRecord::Migration
def change
add_column :categories, :image_url, :string
end
end