Skip to content

Commit

Permalink
Fix more merge issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
karthiknadig committed Sep 28, 2020
1 parent e40f8de commit ecae324
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { cloneDeep } from 'lodash';
import { Event, EventEmitter } from 'vscode';
import { traceVerbose } from '../../../../common/logger';
import { IEnvironmentInfoService } from '../../../info/environmentInfoService';
import { areSameEnvironment, PythonEnvInfo } from '../../info';
import { PythonEnvInfo } from '../../info';
import { areSameEnvironment } from '../../info/env';
import { InterpreterInformation } from '../../info/interpreter';
import {
ILocator, IPythonEnvsIterator, PythonEnvUpdatedEvent, PythonLocatorQuery,
Expand Down

0 comments on commit ecae324

Please sign in to comment.