Fix merge bug (#61)

Author: edriouk

src/solutions/solution-manager.factories.ts

@@ -26,18 +26,16 @@ export type MockSolutionManager = jest.Mocked<StubEvents<SolutionManager>> & { f
 
 export const idleSolutionLoadStateFactory = makeFactory<SolutionLoadState>({
     solutionPath: () => undefined,
-    activated: () => false,
+    activated: () => undefined,
     loaded: () => undefined,
     converted: () => undefined,
-    activated: () => undefined,
 });
 
 export const activeSolutionLoadStateFactory = makeFactory<SolutionLoadState>({
     solutionPath: () => path.join(faker.system.filePath(), `${faker.word.noun()}.csolution.yml`),
     activated: () => true,
     loaded: () => undefined,
     converted: () => undefined,
-    activated: () => true,
 });
 
 const fireOnDidChangeLoadState = (emitter: vscode.EventEmitter<SolutionLoadStateChangeEvent>) => {