Skip to content

Commit

Permalink
Fix bad merge conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewbranch committed Dec 5, 2022
1 parent e4096f8 commit ba708b1
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/compiler/moduleNameResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1755,8 +1755,6 @@ function loadModuleFromFile(extensions: Extensions, candidate: string, onlyRecor
return resolvedByAddingExtension;
}
}

return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);
}

function loadModuleFromFileNoImplicitExtensions(extensions: Extensions, candidate: string, onlyRecordFailures: boolean, state: ModuleResolutionState): PathAndExtension | undefined {
Expand Down

0 comments on commit ba708b1

Please sign in to comment.