[Mplayer-cvslog] CVS: 0_90/help help_mp-fr.h,1.38,1.39

[Nico]

Update of /cvsroot/mplayer/0_90/help
In directory mail:/var/tmp.root/cvs-serv2195/0_90/help

Modified Files:
	help_mp-fr.h 
Log Message:
oops

Index: help_mp-fr.h
===================================================================
RCS file: /cvsroot/mplayer/0_90/help/help_mp-fr.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- help_mp-fr.h	28 Jul 2003 18:00:24 -0000	1.38
+++ help_mp-fr.h	28 Jul 2003 18:05:50 -0000	1.39
@@ -5,14 +5,6 @@
 // ========================= Aide MPlayer ===========================
 
 #ifdef HELP_MP_DEFINE_STATIC
-<<<<<<< help_mp-fr.h
-static char* banner_text=
-"\n\n"
-"MPlayer " VERSION "(C) 2000-2003 Árpád Gereöffy (voir les DOCS)\n"
-"\n";
-
-=======
->>>>>>> 1.37
 static char help_text[]=
 "Utilisation:      mplayer [options] [url|répertoire/]fichier\n"
 "\n"