From d7898085a135f94f6ef25ec6dff67ff3893ad878 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 26 Nov 2018 15:23:04 +0900
Subject: [PATCH] =?UTF-8?q?5.3.2.1=20=EB=B2=84=EC=A0=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/config.php b/config.php
index c16915887..0fc4c9b42 100644
--- a/config.php
+++ b/config.php
@@ -5,12 +5,8 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-<<<<<<< HEAD
-define('G5_GNUBOARD_VER', '5.3.2.0');
-define('G5_YOUNGCART_VER', '5.3.2.0');
-=======
 define('G5_GNUBOARD_VER', '5.3.2.1');
->>>>>>> 70d48e4d5a4ca634bda2ba7095a6207ec1ccf5a8
+define('G5_YOUNGCART_VER', '5.3.2.1');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);