From 6396bad848f8eb107f60063221db2c5892586067 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hotmail.com>
Date: Thu, 2 May 2002 11:27:15 +0000
Subject: [PATCH] missed a conflict indicator

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

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