drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove merge conflict indicator.

This commit is contained in:
Christopher Faylor 2001-10-24 15:40:24 +00:00
parent a0626ebe27
commit a830378213
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/ChangeLog
View File

@ -54,7 +54,6 @@
2001-10-22 Corinna Vinschen <corinna@vinschen.de> 2001-10-22 Corinna Vinschen <corinna@vinschen.de>
>>>>>>> 1.975
* net.cc (get_2k_ifconf): Change multiple IP address naming scheme * net.cc (get_2k_ifconf): Change multiple IP address naming scheme
to Linux style. to Linux style.