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/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -175,7 +175,7 @@ section.content{
  text-align: center;
 }

-.add_icon{
+.menu_item_box{
   cursor: pointer; 
 }

--- a/app/assets/stylesheets/reports/product_sale.scss
+++ b/app/assets/stylesheets/reports/product_sale.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the reports/ProductSale controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/