From e72eaf9c0e0ff924e63eaf257600821f6e52f0fc Mon Sep 17 00:00:00 2001
From: Thein Lin Kyaw <theinlinkyaw@code2lab.com>
Date: Mon, 30 Sep 2019 09:41:48 +0630
Subject: [PATCH] fix conflict Gemfile.lock

---
 Gemfile.lock | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c759e88..01c505f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,15 +157,6 @@ GEM
     minitest (5.12.0)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
-    monetize (1.9.2)
-      money (~> 6.12)
-    money (6.13.4)
-      i18n (>= 0.6.4, <= 2)
-    money-rails (1.13.2)
-      activesupport (>= 3.0)
-      monetize (~> 1.9.0)
-      money (~> 6.13.2)
-      railties (>= 3.0)
     multi_xml (0.6.0)
     mysql2 (0.5.2)
     nested_form (0.3.2)
@@ -349,12 +340,7 @@ DEPENDENCIES
   material_icons
   mini_magick
   momentjs-rails
-<<<<<<< HEAD
   mysql2
-=======
-  money-rails (~> 1.12)
-  mysql2 (>= 0.3.18, < 0.5)
->>>>>>> ec9e4fb7ebe54e215a0bb8ac6c58b49fa9e20712
   nested_form
   pdfjs_viewer-rails
   pg