Author: dick
Date: 2005-03-17 07:29:01 -0500 (Thu, 17 Mar 2005)
New Revision: 41940

Modified:
   trunk/mono/mono/metadata/ChangeLog
Log:
Remove svn change marker



Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2005-03-17 12:10:40 UTC (rev 41939)
+++ trunk/mono/mono/metadata/ChangeLog  2005-03-17 12:29:01 UTC (rev 41940)
@@ -17,7 +17,6 @@
        * reflection.c (mono_image_get_method_info): Encode best_fit_mapping
        and throw_on_unmappable_char attributes.
 
->>>>>>> .r41918
 2005-03-13  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * process.c: Fix buffer length in ves_icall_System_Diagnostics_Process

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to