fixed conflict gem

Gemfile

@@ -9,19 +9,17 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
-<<<<<<< HEAD
+
 #gem 'mysql2', '>= 0.3.18', '< 0.5'
-gem 'pg'
-=======
+
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
-gem 'pg'
+#gem 'pg'
 
 # redis server for cable
 # gem 'redis', '~> 3.0'
 
->>>>>>> a2c9996b765666db4cbcbef188fcfa2d27a7a6e2
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets

Gemfile.lock

@@ -119,7 +119,6 @@ GEM
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     pdf-core (0.7.0)
-    pg (0.20.0)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
@@ -253,7 +252,6 @@ DEPENDENCIES
   kaminari!
   listen (~> 3.0.5)
   mysql2 (>= 0.3.18, < 0.5)
-  pg
   prawn
   prawn-table
   puma (~> 3.0)

app/pdf/receipt_bill_pdf.rb

@@ -23,7 +23,7 @@ class ReceiptBillPdf < Prawn::Document
 
     header( printer_settings.printer_name, printer_settings.name)
         stroke_horizontal_rule
-    cashier_info(sale.receipt_no,sale.customer.name, sale.receipt_date)
+    cashier_info(sale.receipt_no,sale.customer, sale.receipt_date)
     line_items(sale_items)
     all_total(sale_data)