From 0542cfbc8a5c00d52c4dace762f3d448f6f66765 Mon Sep 17 00:00:00 2001
From: George Fleming <v-geflem@microsoft.com>
Date: Tue, 19 Jan 2016 08:48:49 -0800
Subject: [PATCH 1/2] Fix compilation error

---
 src/Microsoft.PowerShell.Linux.Host/main.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Microsoft.PowerShell.Linux.Host/main.cs b/src/Microsoft.PowerShell.Linux.Host/main.cs
index 88385c5d060..ea6aec904b3 100644
--- a/src/Microsoft.PowerShell.Linux.Host/main.cs
+++ b/src/Microsoft.PowerShell.Linux.Host/main.cs
@@ -123,16 +123,13 @@ 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

From 4f7750208311b93af7b8f9d6c8d65b1d575fcabb Mon Sep 17 00:00:00 2001
From: George Fleming <v-geflem@microsoft.com>
Date: Tue, 19 Jan 2016 09:10:33 -0800
Subject: [PATCH 2/2] remove extraneous comment

---
 src/Microsoft.PowerShell.Linux.Host/main.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.PowerShell.Linux.Host/main.cs b/src/Microsoft.PowerShell.Linux.Host/main.cs
index ea6aec904b3..71fcb321ad3 100644
--- a/src/Microsoft.PowerShell.Linux.Host/main.cs
+++ b/src/Microsoft.PowerShell.Linux.Host/main.cs
@@ -123,7 +123,6 @@ internal class Listener
         private object instanceLock = new object();
 
         /// <summary>
-        /// 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;