From f77cd67329d0aebd022002df480b7127b6380699 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Tue, 19 May 2020 13:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/yxshop2.2.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/yxshop2.2.sql b/sql/yxshop2.2.sql
index bb8999e3..f9cf3329 100644
--- a/sql/yxshop2.2.sql
+++ b/sql/yxshop2.2.sql
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /*
  Navicat Premium Data Transfer
 
@@ -6236,4 +6235,3 @@ CREATE TABLE `yx_wechat_user`  (
 INSERT INTO `yx_wechat_user` VALUES (1, NULL, NULL, NULL, 'hupeng', '', 0, '', '', '', '', NULL, 0, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'wechat');
 
 SET FOREIGN_KEY_CHECKS = 1;
->>>>>>> featrue/mp