diff options
| author | tartalo <none@none> | 2009-11-03 14:59:28 +0100 |
|---|---|---|
| committer | tartalo <none@none> | 2009-11-03 14:59:28 +0100 |
| commit | d83080183bb64d81dcae497b514ee599e432e033 (patch) | |
| tree | d1893aa6442a08515f155dd9d8ec63b5f8a9bdee /sql/FULL | |
| parent | 3512a1b316e7fa471b43127744b2bad99d006352 (diff) | |
Backed out changeset 9d1b94a6d369
(I didn't what to push it :P)
--HG--
branch : trunk
Diffstat (limited to 'sql/FULL')
| -rw-r--r-- | sql/FULL/world_trinity_string_full.sql | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/FULL/world_trinity_string_full.sql b/sql/FULL/world_trinity_string_full.sql index 7093ffa1be1..fd0b34c7251 100644 --- a/sql/FULL/world_trinity_string_full.sql +++ b/sql/FULL/world_trinity_string_full.sql @@ -628,11 +628,7 @@ INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `conte (813, 'Veteran', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (814, 'Member', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (815, 'Initiate', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -<<<<<<< local -(816, 'Warning: You''ve entered a no-fly zone and are about to be dismounted', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -======= (816, 'Warning: You''ve entered a no-fly zone and are about to be dismounted!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), ->>>>>>> other (1000, 'Exiting daemon...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1001, 'Account deleted: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (1002, 'Account %s NOT deleted (probably sql file format was updated)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), |