remove conflict data

2018-03-05 16:24:45 +06:30
parent 4b311789e1 311bef4411
commit bd06e80b37
111 changed files with 3612 additions and 1386 deletions
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -33,7 +33,7 @@ class Reports::SaleitemController < BaseReportController

    @from       = from
    @to         = to
-
+    
    # get printer info
    @print_settings = PrintSetting.get_precision_delimiter()