diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-10-24 15:40:24 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-10-24 15:40:24 +0000 |
| commit | a83037821314fead515198f88a9b83e29e66ca2f (patch) | |
| tree | aa5759ecad4b97e9af75cb191c91e2605a89501d | |
| parent | a0626ebe27cd82210cf73434e518b258b59dcdb7 (diff) | |
| download | cygnal-a83037821314fead515198f88a9b83e29e66ca2f.tar.gz cygnal-a83037821314fead515198f88a9b83e29e66ca2f.tar.bz2 cygnal-a83037821314fead515198f88a9b83e29e66ca2f.zip | |
Remove merge 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 47a7f6889..859a3327f 100644 --- 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. |