From 4ccc2c1f7189fd1165b1d84b55c95bcb3eb50862 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 7 Apr 2019 21:08:38 +0900
Subject: [PATCH] =?UTF-8?q?DB=20=EC=8A=A4=ED=82=A4=EB=A7=88=20=EC=A4=80?=
 =?UTF-8?q?=EB=B9=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sql/reset.sql  |  5 -----
 hwe/sql/schema.sql | 14 --------------
 2 files changed, 19 deletions(-)

diff --git a/hwe/sql/reset.sql b/hwe/sql/reset.sql
index 007db718..1b9a4165 100644
--- a/hwe/sql/reset.sql
+++ b/hwe/sql/reset.sql
@@ -20,13 +20,8 @@ DROP TABLE IF EXISTS message;
 # 왕조 테이블은 삭제하지 않음
 
 # 외교 테이블 삭제
-<<<<<<< HEAD
-DROP TABLE IF EXISTS `diplomacy`;
-DROP TABLE IF EXISTS `diplomacy_ticket`;
-=======
 DROP TABLE IF EXISTS diplomacy;
 DROP TABLE IF EXISTS ng_diplomacy;
->>>>>>> 51e9de0e... DB 스키마 준비
 
 # 토너먼트 테이블 삭제
 DROP TABLE IF EXISTS tournament;
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index 9fe2d1f5..9e42d4b4 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -548,19 +548,6 @@ create table diplomacy (
   UNIQUE INDEX `me` (`me`, `you`)
   ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
-<<<<<<< HEAD
-CREATE TABLE `diplomacy_ticket` (
-	`id` INT(11) NOT NULL,
-	`src_nation_id` INT(11) NOT NULL,
-	`dest_nation_id` INT(11) NOT NULL,
-	`type` VARCHAR(16) NOT NULL,
-	`until` INT(11) NOT NULL,
-	`is_request` BIT(1) NULL DEFAULT NULL,
-	`option` TEXT NULL DEFAULT NULL COMMENT 'json',
-	PRIMARY KEY (`id`),
-	INDEX `ticket` (`src_nation_id`, `dest_nation_id`, `type`, `until`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
-=======
 CREATE TABLE `ng_diplomacy` (
 	`no` INT(11) NOT NULL AUTO_INCREMENT,
 	`src_nation_id` INT(11) NOT NULL,
@@ -578,7 +565,6 @@ CREATE TABLE `ng_diplomacy` (
 	INDEX `by_group` (`src_nation_id`, `dest_nation_id`, `group_id`, `revision`)
 )
 ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
->>>>>>> 51e9de0e... DB 스키마 준비
 
 ###########################################################################
 ## 토너먼트 테이블