Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove merge conflict

  • Loading branch information...
commit 4c22ee35c02da0bb671e33572fa371334e9a28fd 1 parent 693b842
@panesofglass panesofglass authored
Showing with 0 additions and 3 deletions.
  1. +0 −3  tests/Fracture.Tests/EchoServerTest.fs
View
3  tests/Fracture.Tests/EchoServerTest.fs
@@ -58,8 +58,6 @@ let ``client starts and stops cleanly even if it does not connect``(poolSize:int
use client = makeEchoClient testEndPoint poolSize size
()
-<<<<<<< HEAD
-=======
[<Test>]
let ``server listens when started and stops listening when stopped``() =
let startAndStop() =
@@ -110,4 +108,3 @@ let ``echo server will echo data from naive socket call``
buffer |> should equal message
echoTest()
shouldNotBeListening()
->>>>>>> 7eaa906... transparently enforce minimum pool sizes: two per pool, as a new saea is pulled from the pool while the other is still being used, even to accept one connection or send one message.
Please sign in to comment.
Something went wrong with that request. Please try again.