Resolve conflicts

darcs-hash:20080722205315-533db-7ebf783855b8f1b302c52ec431b4025ef0983c82.gz
2008-07-22 16:53:15 -04:00 · 2008-07-22 16:53:15 -04:00 · 49f30e23a3
parent de280a4d7f
commit 49f30e23a3
1 changed files with 9 additions and 0 deletions
--- 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