From 1ed15e2e0d7d753d2356dd399c909a1b0953a42e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 31 May 2017 13:54:01 +0630
Subject: [PATCH] pull master

---
 Gemfile      | 3 ---
 Gemfile.lock | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index bcdb0ab0..23f3c908 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,9 +15,6 @@ gem 'mysql2', '>= 0.3.18', '< 0.5'
 # redis server for cable
 gem 'redis', '~> 3.0'
 
-#gem pg for
-gem 'pg'
-
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
diff --git a/Gemfile.lock b/Gemfile.lock
index 1942950c..829845e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -233,6 +233,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
+  mysql2 (>= 0.3.18, < 0.5)
   pg
   prawn
   prawn-table