Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 36 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Rescore/AbstractRescore.php b/vendor/ruflin/elastica/lib/Elastica/Rescore/AbstractRescore.php
deleted file mode 100644
index cb6c7cce..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Rescore/AbstractRescore.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Elastica\Rescore;
-use Elastica\Param;
-
-/**
- * Abstract rescore object. Should be extended by all rescorers.
- *
- * @category Xodoa
- * @package Elastica
- * @author Jason Hu <mjhu91@gmail.com>
- * @link http://www.elasticsearch.org/guide/reference/api/search/rescore/
- */
-abstract class AbstractRescore extends Param
-{
-	/**
-	 * Overridden to return rescore as name
-     *
-     * @return string name
-     */
-    protected function _getBaseName()
-    {
-        return 'rescore';
-    }
-
-    /**
-     * Sets window_size
-     *
-     * @param int $size
-     * @return \Elastica\Rescore
-     */
-    public function setWindowSize($size)
-    {
-        return $this->setParam('window_size', $size);
-    }
-}
\ No newline at end of file