Skip to content

Fix compilation error #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
palladia merged 2 commits into from
Jan 19, 2016
Merged

Fix compilation error #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0542cfb
Fix compilation error
palladia Jan 19, 2016
4f77502
remove extraneous comment
palladia Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/Microsoft.PowerShell.Linux.Host/main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,12 @@ internal class Listener
private object instanceLock = new object();

/// <summary>
<<<<<<< HEAD
/// Gets or sets a value indicating whether the host application
=======
/// To keep track whether we've displayed the debugger help message
/// </summary>
private bool _showHelpMessage;

/// <summary>
/// Gets or sets a value indicating whether the host application
>>>>>>> dev/debug
/// should exit.
/// </summary>
public bool ShouldExit
Expand Down