objectcache: remove redundant merge() definitions

[lhc/web/wiklou.git] / includes / libs / objectcache / RESTBagOStuff.php

diff --git a/includes/libs/objectcache/RESTBagOStuff.php b/includes/libs/objectcache/RESTBagOStuff.php
index 7e578f9..3303692 100644 (file)
--- a/includes/libs/objectcache/RESTBagOStuff.php
+++ b/includes/libs/objectcache/RESTBagOStuff.php
@@ -164,10 +164,6 @@ class RESTBagOStuff extends BagOStuff {
                return false;
        }
 
-       public function merge( $key, callable $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
-               return $this->mergeViaCas( $key, $callback, $exptime, $attempts, $flags );
-       }
-
        /**
         * Handle storage error
         * @param string $msg Error message