[Debburn-changes] r457 - cdrkit/trunk/genisoimage

[Eduard Bloch]

Author: blade
Date: 2006-11-24 00:29:51 +0100 (Fri, 24 Nov 2006)
New Revision: 457

Modified:
   cdrkit/trunk/genisoimage/genisoimage.h
Log:
conflict merge leftovers removed, thanks Lorenz

Modified: cdrkit/trunk/genisoimage/genisoimage.h
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.h	2006-11-23 23:04:29 UTC (rev 456)
+++ cdrkit/trunk/genisoimage/genisoimage.h	2006-11-23 23:29:51 UTC (rev 457)
@@ -547,7 +547,6 @@
 #   else
 extern	void	convert_to_unicode	(unsigned char *buffer,
 			int size, char *source, struct unls_table *inls);
->>>>>>> .merge-rechts.r368
 #   endif
 extern	int	joliet_strlen		__PR((const char *string, struct unls_table *inls));
 #endif