steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge error

freebsd-work
Jack Lucas 2019-02-08 20:19:10 -05:00
parent 6ab0996b1a
commit e3c189fa56
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/io/backend/unix/freebsd/freebsd.factor
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
USING: io.backend io.backend.unix system namespaces kernel accessors assocs continuations unix init io.backend.unix.multiplexers io.backend.unix.multiplexers.kqueue vocabs io.files.unix ; USING: io.backend io.backend.unix system namespaces kernel accessors assocs continuations unix init io.backend.unix.multiplexers io.backend.unix.multiplexers.kqueue vocabs io.files.unix ;
<< "io.files.unix" require >> ! needed for deploy << "io.files.unix" require >> ! needed for deploy
@ -10,8 +9,3 @@ freebsd set-io-backend
[ start-signal-pipe-thread ] [ start-signal-pipe-thread ]
"io.backend.unix:signal-pipe-thread" add-startup-hook "io.backend.unix:signal-pipe-thread" add-startup-hook
=======
USING: io.backend.unix.bsd io.backend system ;
freebsd set-io-backend
>>>>>>> da9226d5b5... Re-add Freebsd Support