From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Tue, 22 Jul 2008 20:53:15 +0000 (-0400)
Subject: Resolve conflicts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=49f30e23a34d59cc9784c256ffebbf586adc0970;p=quix0rs-gnu-social.git

Resolve conflicts

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

diff --git a/classes/stoica.ini b/classes/stoica.ini
index 3042b3aa08..dd72fc3888 100644
--- 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