Fixed conflicted merges

awaescher · Sep 5, 2024 · afe1e5e · afe1e5e
1 parent 4b2b5e0
commit afe1e5e
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 243 deletions.
diff --git a/RepoZ.Ipc/DefaultIpcEndpoint.cs b/RepoZ.Ipc/DefaultIpcEndpoint.cs
@@ -1,11 +1,5 @@
 namespace RepoZ.Ipc
 {
-<<<<<<< HEAD
-	public class DefaultIpcEndpoint : IIpcEndpoint
-	{
-		public string Address => "tcp://localhost:18181";
-	}
-=======
     public class DefaultIpcEndpoint : IIpcEndpoint
     {
 #if DEBUG
@@ -14,5 +8,4 @@ public class DefaultIpcEndpoint : IIpcEndpoint
         public string Address => "tcp://localhost:18182";
 #endif
     }
->>>>>>> 3895eb2 (Colours)
 }
diff --git a/Specs/Ipc/TestIpcEndpoint.cs b/Specs/Ipc/TestIpcEndpoint.cs
@@ -1,19 +1,7 @@
 using RepoZ.Ipc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Specs.Ipc
 {
-<<<<<<< HEAD
-	class TestIpcEndpoint : IIpcEndpoint
-	{
-		public string Address => "tcp://localhost:18182";
-	}
-}
-=======
     class TestIpcEndpoint : IIpcEndpoint
     {
 
@@ -24,4 +12,3 @@ class TestIpcEndpoint : IIpcEndpoint
 #endif
     }
 }
->>>>>>> 14dc727 (fixing the port debug issue)