summaryrefslogtreecommitdiff
path: root/inc/FeedParser.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-03-12 14:11:50 +0100
committerAndreas Gohr <andi@splitbrain.org>2010-03-12 14:11:50 +0100
commitd7879495eef6e6a998f5d727304e88dfa5420108 (patch)
tree720cee6a7b738e5fec32492b4f6c1cf69312583d /inc/FeedParser.php
parent84645d8c01570c5ea4cda556e70beccdec25ee22 (diff)
parent05ed2c25ea0dc45eef2af0f9f4176c939af41100 (diff)
downloadrpg-d7879495eef6e6a998f5d727304e88dfa5420108.tar.gz
rpg-d7879495eef6e6a998f5d727304e88dfa5420108.tar.bz2
Merge branch 'requireall'
Conflicts: inc/fulltext.php
Diffstat (limited to 'inc/FeedParser.php')
-rw-r--r--inc/FeedParser.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index f37888f01..9d00e7abf 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -6,9 +6,6 @@
*/
if(!defined('DOKU_INC')) die('meh.');
-require_once(DOKU_INC.'inc/HTTPClient.php');
-require_once(DOKU_INC.'inc/SimplePie.php');
-
/**
* We override some methods of the original SimplePie class here