Remove conflict indicator from ChangeLog

2003-09-30 07:53:10 +00:00 · 2003-09-30 07:53:10 +00:00 · fe5fb62c09
parent 4d36c543ea
commit fe5fb62c09
1 changed files with 0 additions and 1 deletions
--- 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,