fixed conflicts

front-api/app.rb

@@ -16,7 +16,8 @@ before do
   content_type :json
   # TODO: before running to production change this so that only specific
   #       domain is allowed
-  headers 'Access-Control-Allow-Origin' => 'http://192.168.1.35:3001',
+
+  headers 'Access-Control-Allow-Origin' => 'http://localhost:3001',
     'Access-Control-Allow-Methods' => ['OPTIONS', 'GET', 'POST','PUT'],
     'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept',
     'Access-Control-Expose-Headers' => 'X-Total-Count',

front-api/db/schema.rb

@@ -130,8 +130,8 @@ ActiveRecord::Schema.define(version: 20150614050336) do
     t.datetime "updated_at",                                                     null: false
     t.string   "tags"
     t.json     "traits"
-    t.integer  "supplier_id"
     t.decimal  "weight",                                 precision: 5, scale: 3
+    t.integer  "supplier_id"
     t.integer  "delivery_time_estimation_id"
     t.integer  "brand_id"
   end