resolve conflict

This commit is contained in:
Pim Snel 2004-03-09 14:55:05 +00:00
parent 8f6aca7668
commit f0d23f2bae

View File

@ -25,6 +25,7 @@
'deleteaccount', 'deleteaccount',
'settings', 'settings',
'sidebox_menu', 'sidebox_menu',
'personalizer',
'preferences', 'preferences',
'manual' 'manual'
); );