1
0
Fork 0

Oops, fixed minor merge issue.

This commit is contained in:
ThorstenB 2011-06-13 22:44:07 +02:00
parent 1bf8b99bc9
commit 7cff49aad4

View file

@ -1240,11 +1240,8 @@ Started September 2000 by David Megginson, david@megginson.com
<atc-chatter> <atc-chatter>
<enabled type="bool" userarchive="n">false</enabled> <enabled type="bool" userarchive="n">false</enabled>
</atc-chatter> </atc-chatter>
</nasal>
<nasal>
<local_weather> <local_weather>
<enabled type="bool" userarchive="y">false</enabled> <enabled type="bool" userarchive="y">false</enabled>
</local_weather> </local_weather>
</nasal> </nasal>