Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix characters.sql bad merge leftovers

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Chaz Brown
2009-04-21 02:09:52 -04:00
parent 624c30138a
commit 9e46994506
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/characters.sql
View File

@@ -16,29 +16,6 @@
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
<<<<<<< HEAD:sql/characters.sql
=======
-- Table structure for table `character_db_version`
--
DROP TABLE IF EXISTS `character_db_version`;
CREATE TABLE `character_db_version` (
`required_7644_01_characters_character_pet` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
--
-- Dumping data for table `character_db_version`
--
LOCK TABLES `character_db_version` WRITE;
/*!40000 ALTER TABLE `character_db_version` DISABLE KEYS */;
INSERT INTO `character_db_version` VALUES
(NULL);
/*!40000 ALTER TABLE `character_db_version` ENABLE KEYS */;
UNLOCK TABLES;
--
>>>>>>> ddfa7199207e499dd233854a75ac3a6216938873:sql/characters.sql
-- Table structure for table `account_data`
--