fix: Merge conflict was checked in.

Author: chriseppstein

packages/@css-blocks/vscode/src/test/index.ts

@@ -1,20 +1,3 @@
-<<<<<<< HEAD
-/* --------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- * ------------------------------------------------------------------------------------------ */
-
-import * as testRunner from 'vscode/lib/testrunner';
-
-testRunner.configure({
-    ui: 'bdd',
-    useColors: true,
-    timeout: 100000
-});
-
-module.exports = testRunner;
-||||||| merged common ancestors
-=======
 import * as testRunner from 'vscode/lib/testrunner';
 
 testRunner.configure({
@@ -24,4 +7,3 @@ testRunner.configure({
 });
 
 module.exports = testRunner;
->>>>>>> lang-server-spike