Commit 1e4560f3 authored by Mart Lubbers's avatar Mart Lubbers

merge

parent 65f357c5
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment