Remove merge conflict indicator.

2001-10-24 15:40:24 +00:00 · 2001-10-24 15:40:24 +00:00 · a830378213
parent a0626ebe27
commit a830378213
1 changed files with 0 additions and 1 deletions
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@ -54,7 +54,6 @@

 2001-10-22  Corinna Vinschen  <corinna@vinschen.de>

->>>>>>> 1.975
 	* net.cc (get_2k_ifconf): Change multiple IP address naming scheme
 	to Linux style.