JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missed a conflict indicator

Browse Source
This commit is contained in:
Robert Collins
2002-05-02 11:27:15 +00:00
parent 37143995da
commit 6396bad848
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/ChangeLog
View File

@@ -50,7 +50,6 @@ Wed May 1 16:06:02 2002 Jason Tishler <jason@tishler.net>
* include/cygwin/types.h: Include <sys/sysmacros.h>. * include/cygwin/types.h: Include <sys/sysmacros.h>.
>>>>>>> 1.1179
Wed Apr 17 11:27:04 2002 Jason Tishler <jason@tishler.net> Wed Apr 17 11:27:04 2002 Jason Tishler <jason@tishler.net>
* security.cc (get_lsa_srv_inf): Prevent extraneous backslashes for * security.cc (get_lsa_srv_inf): Prevent extraneous backslashes for