fixed conflict

front-api/db/migrate/20150131134330_add_image_to_categories.rb

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

front-api/db/schema.rb

@@ -11,6 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+
 ActiveRecord::Schema.define(version: 20150131061353) do
 
   # These are extensions that must be enabled in order to support this database
@@ -19,6 +20,7 @@ ActiveRecord::Schema.define(version: 20150131061353) do
   create_table "categories", force: :cascade do |t|
     t.string  "name"
     t.integer "section_id"
+    t.string  "image_url"
   end
 
   create_table "items", force: :cascade do |t|
@@ -55,10 +57,8 @@ ActiveRecord::Schema.define(version: 20150131061353) do
   end
 
   create_table "sub_categories", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "category_id"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.string  "name"
+    t.integer "category_id"
   end
 
   create_table "units", force: :cascade do |t|