From 0c5cb2bf22c010604c3feeec0e181502d5d0e16d Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Wed, 25 Sep 2013 09:14:49 +1200
Subject: [PATCH] MDL-40903 fixed merge conflicts against integration

---
 lib/db/caches.php | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/lib/db/caches.php b/lib/db/caches.php
index f2445e234d0..c6ca0865265 100644
--- a/lib/db/caches.php
+++ b/lib/db/caches.php
@@ -147,53 +147,6 @@ $definitions = array(
         'mode' => cache_store::MODE_APPLICATION,
         'simplekeys' => true,
         'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 2,
-    ),
-
-    // Cache used by the {@link plugininfo_mod} class.
-    'plugininfo_mod' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_block} class.
-    'plugininfo_block' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_filter} class.
-    'plugininfo_filter' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_repository} class.
-    'plugininfo_repository' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_portfolio} class.
-    'plugininfo_portfolio' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
     ),
 
     // Used to store the full tree of course categories.