diff options
| author | Robert Collins <rbtcollins@hotmail.com> | 2002-05-02 15:27:15 +0400 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hotmail.com> | 2002-05-02 15:27:15 +0400 |
| commit | 6396bad848f8eb107f60063221db2c5892586067 (patch) | |
| tree | 75c860fe76da212bf195c5a2b612f85f8db725e1 | |
| parent | 37143995da0e1b8e0a540034f244e58542b379df (diff) | |
missed a conflict indicator
| -rw-r--r-- | winsup/cygwin/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 356a9ef14..ca4c6b0bc 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -50,7 +50,6 @@ Wed May 1 16:06:02 2002 Jason Tishler <jason@tishler.net> * include/cygwin/types.h: Include <sys/sysmacros.h>. ->>>>>>> 1.1179 Wed Apr 17 11:27:04 2002 Jason Tishler <jason@tishler.net> * security.cc (get_lsa_srv_inf): Prevent extraneous backslashes for |