fixed conflict

2019-11-15 16:25:03 +06:30
parent 3253518aae
commit 9138a1e38e
1 changed files with 2 additions and 5 deletions
--- a/7
+++ b/7
@@ -46,12 +46,9 @@ gem 'mini_magick'
 gem 'jquery-fileupload-rails', '~> 0.4.7'

 #Report and Printing gems
-<<<<<<< HEAD
+
 gem 'cups', '~> 0.0.7'
-=======
-#gem 'cups' #remove for cloud installation
-gem 'cups', '~>0.0.7'
->>>>>>> r-1902001-01
+
 gem 'prawn'
 gem 'prawn-table'
 gem 'prawn-qrcode'