Fix conflict

diff --cc basis/libc/libc.factor
index 623d2f23afcc81d5c4787a7e3cc58311ceb90279,c154544f81a6c4e9d319237c3436219f5044bb44..6863c6ee650306a65cfba745b3178d5c5502e259
--- 1/basis/libc/libc.factor
--- 2/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@@ -1,11 -1,17 +1,17 @@@
  ! Copyright (C) 2004, 2005 Mackenzie Straight
 -! Copyright (C) 2007, 2008 Slava Pestov
 +! Copyright (C) 2007, 2009 Slava Pestov
  ! Copyright (C) 2007, 2008 Doug Coleman
  ! See http://factorcode.org/license.txt for BSD license.
 -USING: alien assocs continuations destructors
 -kernel namespaces accessors sets summary ;
 +USING: alien assocs continuations alien.destructors kernel
 +namespaces accessors sets summary ;
  IN: libc
  
+ : errno ( -- int )
+     "int" "factor" "err_no" { } alien-invoke ;
+ 
+ : clear-errno ( -- )
+     "void" "factor" "clear_err_no" { } alien-invoke ;
+ 
  <PRIVATE
  
  : (malloc) ( size -- alien )