summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-22 16:53:15 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-22 16:53:15 -0400
commit49f30e23a34d59cc9784c256ffebbf586adc0970 (patch)
tree067ec98a4202aab66c57104e30c31b46335097c3
parentde280a4d7f8a8461f14ed1a83958cef0af6aebee (diff)
Resolve conflicts
darcs-hash:20080722205315-533db-7ebf783855b8f1b302c52ec431b4025ef0983c82.gz
-rw-r--r--classes/stoica.ini9
1 files changed, 9 insertions, 0 deletions
diff --git a/classes/stoica.ini b/classes/stoica.ini
index 3042b3aa0..dd72fc388 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