Resolve conflicts

darcs-hash:20080722205315-533db-7ebf783855b8f1b302c52ec431b4025ef0983c82.gz

diff --git a/classes/stoica.ini b/classes/stoica.ini
index 3042b3aa08e0c9e3bcbe2ad534a165613a24c323..dd72fc388839fae9fc769251574928168f052313 100644 (file)
--- a/classes/stoica.ini
+++ b/classes/stoica.ini
@@ -76,6 +76,15 @@ created = 142
 tag = K
 notice_id = K
 
+[notice_source]
+code = 130
+name = 130
+url = 130
+created = 142
+modified = 384
+
+[notice_source__keys]
+code = K
 
 [profile]
 id = 129