1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00

fix merge confict

This commit is contained in:
Thomas Citharel 2014-11-19 16:54:28 +01:00
commit e9d4d17693
4 changed files with 5 additions and 5 deletions

View file

@ -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);