Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-36621 calendar: fixed up conflict error

  • Loading branch information...
commit 59573bb447c4aabc42a3b972bf7d0bc89f0003f0 1 parent 3654684
@samhemelryk samhemelryk authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/db/caches.php
View
4 lib/db/caches.php
@@ -104,12 +104,12 @@
'simpledata' => true, // Array of stdClass objects containing only strings.
'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.
- )
+ ),
// Used to cache calendar subscriptions.
'calendar_subscriptions' => array(
'mode' => cache_store::MODE_APPLICATION,
'simplekeys' => true,
'simpledata' => true,
'persistent' => true,
- ),
+ )
);
Please sign in to comment.
Something went wrong with that request. Please try again.