Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 0 insertions, 24 deletions

diff --git a/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php b/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php
deleted file mode 100644
index 137e67b0..00000000
--- a/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-class WikiEditorSeleniumConfig {
-
-	public static function getSettings( &$includeFiles, &$globalConfigs ) {
-		$includes = array(
-			'extensions/Vector/Vector.php',
-		    'extensions/WikiEditor/WikiEditor.php'
-		);
-		$configs = array(
-			'wgDefaultSkin' => 'vector',
-			'wgWikiEditorFeatures' => array(
-				'toolbar' => array( 'global' => true, 'user' => true ),
-				'dialogs' => array( 'global' => true, 'user' => true )
-			),
-			'wgVectorFeatures' => array(
-				'editwarning' => array( 'global' => false, 'user' => false )
-			)
-		);
-		$includeFiles = array_merge( $includeFiles, $includes );
-		$globalConfigs = array_merge( $globalConfigs, $configs );
-		return true;
-	}
-}