From 1e4560f3df436bf833905438c4df628e154cc439 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 25 Sep 2018 16:47:00 +0200 Subject: [PATCH] merge --- TTY.dcl | 1 - 1 file changed, 1 deletion(-) diff --git a/TTY.dcl b/TTY.dcl index adc352e..4bd19db 100644 --- a/TTY.dcl +++ b/TTY.dcl @@ -93,7 +93,6 @@ TTYread :: !*TTY -> (!Int, !*TTY) * @result new tty handle */ TTYreadline :: !*TTY -> (!String, !*TTY) -<<<<<<< HEAD /** * Checks if the TTY device is available for reading -- GitLab