fix merge confict

2014-11-19 16:54:28 +01:00
parent d25a3f13c2 25f9c66834
commit e9d4d17693
4 changed files with 5 additions and 5 deletions
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@ -67,4 +67,4 @@
 //limit for download of articles during import
@define ('IMPORT_LIMIT', 5);
 //delay between downloads (in sec)
-@define ('IMPORT_DELAY', 5);
+@define ('IMPORT_DELAY', 5);