Skip to content

Commit

Permalink
Address merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinRansom committed Oct 18, 2017
1 parent 114e275 commit f6b435c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/fsharp/CompileOptions.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ let GetCoreServiceCompilerOptions (tcConfigB:TcConfigBuilder) =
let isHelpOption = function CompilerOption(_,_,OptionHelp _,_,_) -> true | _ -> false
List.map (FilterCompilerOptionBlock (isHelpOption >> not)) (GetCoreFscCompilerOptions tcConfigB)

/// The core/common options used by fsi.exe. [note, some additional options are added in fsi.fs].ApplyCommandLineArgs
/// The core/common options used by fsi.exe. [note, some additional options are added in fsi.fs].
let GetCoreFsiCompilerOptions (tcConfigB: TcConfigBuilder) =
[ PublicOptions(FSComp.SR.optsHelpBannerOutputFiles() , outputFileFlagsFsi tcConfigB)
PublicOptions(FSComp.SR.optsHelpBannerInputFiles() , inputFileFlagsFsi tcConfigB)
Expand Down

0 comments on commit f6b435c

Please sign in to comment.