diff options
| author | tartalo <none@none> | 2009-11-03 14:59:56 +0100 |
|---|---|---|
| committer | tartalo <none@none> | 2009-11-03 14:59:56 +0100 |
| commit | b82cf57807506de1ff81c4ca4dfc1e1f910fc4b2 (patch) | |
| tree | e5062f18c8f1c9a89a072a9be9d58296c578ada3 /sql | |
| parent | 461b90824fcef055780d8d4b857147fb69a2fc23 (diff) | |
| parent | d83080183bb64d81dcae497b514ee599e432e033 (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, 0 insertions, 6 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), diff --git a/sql/updates/6172_world.sql b/sql/updates/6172_world.sql deleted file mode 100644 index 4d929321ef5..00000000000 --- a/sql/updates/6172_world.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE `trinity_string` SET `content_default`='Warning: You''ve entered a no-fly zone and are about to be dismounted!' WHERE entry=816; - |