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 304b3924b51ba05f1d872239309d70e2ab7afbfe..0f88f335231e131dd1c734c4aad30f3fb64403be 100755 (executable)
--- a/inc/poche/config.inc.default.php
+++ b/inc/poche/config.inc.default.php
@@ -49,6 +49,7 @@
 @define ('NOT_FLATTRABLE', '0');
 @define ('FLATTRABLE', '1');
 @define ('FLATTRED', '2');
+@define ('CARROT', FALSE);
 // display or not print link in article view
 @define ('SHOW_PRINTLINK', '1');
 // display or not percent of read in article view. Affects only default theme.