From a83037821314fead515198f88a9b83e29e66ca2f Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Wed, 24 Oct 2001 15:40:24 +0000
Subject: [PATCH] Remove merge conflict indicator.

---
 winsup/cygwin/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.