From 54219c1f6a510bc798ff9a4a7e52647a95d01469 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Thu, 7 Dec 2017 11:22:15 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B8=205.2.9.7=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EB=B3=80=EA=B2=BD?=
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 f4e7bece2..66e9b8c86 100644
--- a/config.php
+++ b/config.php
@@ -5,12 +5,8 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-<<<<<<< HEAD
-define('G5_GNUBOARD_VER', '5.2.9.6');
-define('G5_YOUNGCART_VER', '5.2.9.6');
-=======
 define('G5_GNUBOARD_VER', '5.2.9.7');
->>>>>>> 82279c376ba339fe814ec478da83ac8c24e7240f
+define('G5_YOUNGCART_VER', '5.2.9.7');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);