From 7cff49aad463c142c6cb0c2f6d1d4b08c63fa5e9 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Mon, 13 Jun 2011 22:44:07 +0200
Subject: [PATCH] Oops, fixed minor merge issue.

---
 preferences.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/preferences.xml b/preferences.xml
index d60bff804..cbc3ae3dc 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -1240,11 +1240,8 @@ Started September 2000 by David Megginson, david@megginson.com
 		<atc-chatter>
 			<enabled type="bool" userarchive="n">false</enabled>
 		</atc-chatter>
-	</nasal>
-
-	<nasal>
 	    <local_weather>
-  		<enabled type="bool" userarchive="y">false</enabled>
+  			<enabled type="bool" userarchive="y">false</enabled>
 	    </local_weather>
 	</nasal>