From e592bed3e5287b766f646a0b9db226d1731f3b96 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <me@chillu.com>
Date: Thu, 22 Jun 2017 23:07:58 +1200
Subject: [PATCH] Fixed merge error

---
 tests/php/Security/SecurityTest.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/php/Security/SecurityTest.php b/tests/php/Security/SecurityTest.php
index 40e4dc0aa..4487739bf 100644
--- a/tests/php/Security/SecurityTest.php
+++ b/tests/php/Security/SecurityTest.php
@@ -19,15 +19,6 @@ use SilverStripe\Security\Member;
 use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator;
 use SilverStripe\Security\Security;
 use SilverStripe\Security\SecurityToken;
-use SilverStripe\Core\Config\Config;
-use SilverStripe\Core\Convert;
-use SilverStripe\Dev\FunctionalTest;
-use SilverStripe\Dev\TestOnly;
-use SilverStripe\Control\HTTPResponse;
-use SilverStripe\Control\Session;
-use SilverStripe\Control\Director;
-use SilverStripe\Control\Controller;
-use SilverStripe\i18n\i18n;
 
 /**
  * Test the security class, including log-in form, change password form, etc