fix merge confict

[github/wallabag/wallabag.git] / inc / poche / config.inc.default.php

diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index de992a9c294731514886933a8d4cf91355975d0b..0f88f335231e131dd1c734c4aad30f3fb64403be 100755 (executable)
--- 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);
\ No newline at end of file
+@define ('IMPORT_DELAY', 5);