From a4fa34cecbd038fb2cc323aefd2b32739aaee7d5 Mon Sep 17 00:00:00 2001 From: mikec Date: Mon, 21 Jul 2008 09:56:37 -0400 Subject: Resolve conflicts after pull from evan darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz --- lib/common.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/common.php') 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'); -- cgit v1.2.3-54-g00ecf