fixed merge issues

DonJayamanne · DonJayamanne · commit e4238e664ec5 · 2016-09-08T16:39:22.000+10:00
diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -19,6 +19,7 @@ import * as telemetryContracts from './common/telemetryContracts';
 import {PythonCodeActionsProvider} from './providers/codeActionProvider';
 import {activateSimplePythonRefactorProvider} from './providers/simpleRefactorProvider';
 import {activateSetInterpreterProvider} from './providers/setInterpreterProvider';
+import {activateExecInTerminalProvider} from './providers/execInTerminalProvider'
 import * as tests from './unittests/main';
 
 const PYTHON: vscode.DocumentFilter = { language: 'python', scheme: 'file' };
diff --git a/src/client/unittests/unittest/main.ts b/src/client/unittests/unittest/main.ts
@@ -23,11 +23,6 @@ export class TestManager extends BaseTestManager {
                 return fn.testFunction.status === TestStatus.Error || fn.testFunction.status === TestStatus.Fail;
             }).map(fn=>fn.testFunction);
         }
-<<<<<<< a3034a0dafa547afd949f2b0dcbdcba6accb5764
-        
-=======
-
->>>>>>> unitests using python unittest framework #239
         return runTest(this.rootDirectory, tests, args, testsToRun, this.cancellationToken, this.outputChannel);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,6 @@ export class TestManager extends BaseTestManager {`
`23`	`23`	`return fn.testFunction.status === TestStatus.Error \|\| fn.testFunction.status === TestStatus.Fail;`
`24`	`24`	`}).map(fn=>fn.testFunction);`
`25`	`25`	`}`
`26`		`-<<<<<<< a3034a0dafa547afd949f2b0dcbdcba6accb5764`
`27`		`-`
`28`		`-=======`
`29`		`-`
`30`		`->>>>>>> unitests using python unittest framework #239`
`31`	`26`	`return runTest(this.rootDirectory, tests, args, testsToRun, this.cancellationToken, this.outputChannel);`
`32`	`27`	`}`
`33`	`28`	`}`