~ chicken-core (chicken-5) 2690bcf21931a34a5357f7d4e0967dd6b57fc36d

commit 2690bcf21931a34a5357f7d4e0967dd6b57fc36d
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Dec 9 09:26:42 2009 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Wed Dec 9 09:26:42 2009 +0100

    resolved conflict

diff --git a/posixwin.scm b/posixwin.scm
index a551535b..699d04d8 100644
--- a/posixwin.scm
+++ b/posixwin.scm
@@ -2,8 +2,8 @@
 ;
 ; By Sergey Khorev
 ;
-; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; Copyright (c) 2008-2009, The Chicken Team
+; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following