remove conflict data

2018-02-27 14:35:21 +06:30
parent 3e0943275f 4d556cff43
commit adefd8c034
49 changed files with 1989 additions and 363 deletions
--- a/spec/controllers/reports/product_sale_controller_spec.rb
+++ b/spec/controllers/reports/product_sale_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Reports::ProductSaleController, type: :controller do
+
+end