Conflict fix din settings_backend

db/migrate/20170403151731_create_order_queue_stations.rb

@@ -9,6 +9,7 @@ class CreateOrderQueueStations < ActiveRecord::Migration[5.1]
       t.integer :font_size, :null => false, :default => 10
       t.boolean :cut_per_item, :null => false, :default => false
       t.boolean :use_alternate_name, :null => false, :default => false
+      t.boolean :auto_print, :null => false, :default => false
       t.string  :created_by, :null => false
       t.timestamps
     end

db/migrate/20170617163811_create_dining_queues.rb

@@ -5,6 +5,7 @@ class CreateDiningQueues < ActiveRecord::Migration[5.1]
       t.string :contact_no
       t.string :queue_no
       t.string :status
+      t.references :dining_facility, foreign_key: true
 
       t.timestamps
     end