From a4fa34cecbd038fb2cc323aefd2b32739aaee7d5 Mon Sep 17 00:00:00 2001
From: mikec <mikec@mikenz.geek.nz>
Date: Mon, 21 Jul 2008 09:56:37 -0400
Subject: Resolve conflicts after pull from evan

darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
---
 classes/stoica.ini | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'classes/stoica.ini')

diff --git a/classes/stoica.ini b/classes/stoica.ini
index 31fb6d159..3042b3aa0 100644
--- a/classes/stoica.ini
+++ b/classes/stoica.ini
@@ -172,6 +172,10 @@ password = 2
 email = 2
 incomingemail = 2
 emailnotifysub = 17
+emailmicroid = 17
+language = 2
+timezone = 2
+emailpost = 17
 jabber = 2
 jabbernotify = 17
 jabberreplies = 17
-- 
cgit v1.2.3-54-g00ecf