From fe5fb62c0924261e8f61a284a09b12f894d4bcaf Mon Sep 17 00:00:00 2001
From: Danny Smith <dannysmith@users.sourceforge.net>
Date: Tue, 30 Sep 2003 07:53:10 +0000
Subject: [PATCH] Remove conflict indicator from ChangeLog

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

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 48d4a8e3b..436b097c6 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -34,7 +34,6 @@
 	* lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there
 	are ANSI/Unicode versions of this function.
 
->>>>>>> 1.469
 2003-09-29  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE,
-- 
2.43.5