From 9138a1e38e3b989aa9d8337056c3554410a4fc91 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 15 Nov 2019 16:25:03 +0630
Subject: [PATCH] fixed conflict

---
 Gemfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 57f4ab7c..8c30c9a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'