diff options
| author | tartalo <none@none> | 2009-11-03 14:54:40 +0100 |
|---|---|---|
| committer | tartalo <none@none> | 2009-11-03 14:54:40 +0100 |
| commit | 3512a1b316e7fa471b43127744b2bad99d006352 (patch) | |
| tree | 7b48e5f6d28f3bb1f004198afc449e5a94bf7b82 /sql | |
| parent | de9551b648de36301ad7b943310a581b4641dd7e (diff) | |
merge
--HG--
branch : trunk
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/FULL/world_trinity_string_full.sql | 4 | ||||
| -rw-r--r-- | sql/updates/6172_world.sql | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/FULL/world_trinity_string_full.sql b/sql/FULL/world_trinity_string_full.sql index fd0b34c7251..7093ffa1be1 100644 --- a/sql/FULL/world_trinity_string_full.sql +++ b/sql/FULL/world_trinity_string_full.sql @@ -628,7 +628,11 @@ 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), diff --git a/sql/updates/6172_world.sql b/sql/updates/6172_world.sql new file mode 100644 index 00000000000..4d929321ef5 --- /dev/null +++ b/sql/updates/6172_world.sql @@ -0,0 +1,2 @@ +UPDATE `trinity_string` SET `content_default`='Warning: You''ve entered a no-fly zone and are about to be dismounted!' WHERE entry=816; + |