From 3512a1b316e7fa471b43127744b2bad99d006352 Mon Sep 17 00:00:00 2001
From: tartalo <none@none>
Date: Tue, 3 Nov 2009 14:54:40 +0100
Subject: [PATCH] merge

--HG--
branch : trunk
---
 sql/FULL/world_trinity_string_full.sql | 4 ++++
 sql/updates/6172_world.sql             | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 sql/updates/6172_world.sql

diff --git a/sql/FULL/world_trinity_string_full.sql b/sql/FULL/world_trinity_string_full.sql
index fd0b34c725..7093ffa1be 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 0000000000..4d929321ef
--- /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;
+