summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormikec <mikec@mikenz.geek.nz>2008-07-21 09:56:37 -0400
committermikec <mikec@mikenz.geek.nz>2008-07-21 09:56:37 -0400
commita4fa34cecbd038fb2cc323aefd2b32739aaee7d5 (patch)
tree040f9ea3ee60f79c814d6732e5360a0dc687428d /lib
parentd48609ac51f9f7aa5b57df1e9ab9aa7353721c00 (diff)
Resolve conflicts after pull from evan
darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/common.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/common.php b/lib/common.php
index b4c16660f..dadf64ae3 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -121,5 +121,7 @@ require_once(INSTALLDIR.'/classes/Confirm_address.php');
require_once(INSTALLDIR.'/classes/Remember_me.php');
require_once(INSTALLDIR.'/classes/Queue_item.php');
require_once(INSTALLDIR.'/classes/Reply.php');
+require_once(INSTALLDIR.'/classes/Notice_tag.php');
+require_once(INSTALLDIR.'/classes/Sms_carrier.php');
require_once('markdown.php');