From a27abdb95694be75ddef5fad5de748e3436463ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= <sludwig@outerproduct.org>
Date: Mon, 11 May 2020 17:08:51 +0200
Subject: [PATCH] Fixup.

---
 source/eventcore/drivers/posix/pipes.d | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/eventcore/drivers/posix/pipes.d b/source/eventcore/drivers/posix/pipes.d
index 36a9e4c..1e4cef5 100644
--- a/source/eventcore/drivers/posix/pipes.d
+++ b/source/eventcore/drivers/posix/pipes.d
@@ -350,7 +350,6 @@ final class PosixEventDriverPipes(Loop : PosixEventLoop) : EventDriverPipes {
 	@system {
 		return m_loop.rawUserDataImpl(fd, size, initialize, destroy);
 	}
->>>>>>> 568465d... Make the API robust against using invalid handles. Fixes #105.
 }
 
 final class DummyEventDriverPipes(Loop : PosixEventLoop) : EventDriverPipes {