MDL-36621 calendar: fixed up conflict error

This commit is contained in:
Sam Hemelryk 2013-01-22 16:35:48 +13:00
parent 36546841f1
commit 59573bb447

View File

@ -104,12 +104,12 @@ $definitions = array(
'simpledata' => true, // Array of stdClass objects containing only strings. 'simpledata' => true, // Array of stdClass objects containing only strings.
'persist' => true, // Likely there will be a couple of calls to this. 'persist' => true, // Likely there will be a couple of calls to this.
'persistmaxsize' => 2, // The original cache used 1, we've increased that to two. 'persistmaxsize' => 2, // The original cache used 1, we've increased that to two.
) ),
// Used to cache calendar subscriptions. // Used to cache calendar subscriptions.
'calendar_subscriptions' => array( 'calendar_subscriptions' => array(
'mode' => cache_store::MODE_APPLICATION, 'mode' => cache_store::MODE_APPLICATION,
'simplekeys' => true, 'simplekeys' => true,
'simpledata' => true, 'simpledata' => true,
'persistent' => true, 'persistent' => true,
), )
); );