aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-11-19 16:54:28 +0100
committerThomas Citharel <tcit@tcit.fr>2014-11-19 16:54:28 +0100
commite9d4d17693e2d85f1a17a29f3e82e5d0235a10ad (patch)
treea17b5939046b29742d2d54e2b28a95dc6c9e5936 /inc
parentd25a3f13c2617d6d3f6d6433d426fab47727f038 (diff)
parent25f9c668348ae8d15e557bafc0e4aff2e2477e87 (diff)
downloadwallabag-e9d4d17693e2d85f1a17a29f3e82e5d0235a10ad.tar.gz
wallabag-e9d4d17693e2d85f1a17a29f3e82e5d0235a10ad.tar.zst
wallabag-e9d4d17693e2d85f1a17a29f3e82e5d0235a10ad.zip
fix merge confict
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/config.inc.default.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php
index de992a9c..0f88f335 100755
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -67,4 +67,4 @@
67//limit for download of articles during import 67//limit for download of articles during import
68@define ('IMPORT_LIMIT', 5); 68@define ('IMPORT_LIMIT', 5);
69//delay between downloads (in sec) 69//delay between downloads (in sec)
70@define ('IMPORT_DELAY', 5); \ No newline at end of file 70@define ('IMPORT_DELAY', 5);