Re: CVS webwml/english/events/2001

[Martin Schulze <joey@finlandia.infodrom.north.de>]

Spanish people, stop inserting rubbish!

I'm not talking about tons of binary crap but broken wml files.

Regards,

	Joey

Debian CVS spanish wrote:
> Update of /cvs/webwml/webwml/english/events/2001
> In directory klecker:/tmp/cvs-serv1712/2001
> 
> Modified Files:
> 	0705-linuxtag.wml 
> Log Message:
> 
> 
> --- /cvs/webwml/webwml/english/events/2001/0705-linuxtag.wml	2001/07/16 08:09:41	1.13
> +++ /cvs/webwml/webwml/english/events/2001/0705-linuxtag.wml	2001/09/08 11:39:06	1.14
> @@ -19,17 +19,19 @@
>  </define-tag>
>  
>  <define-tag involve>
> -
>      Debian will be present with a booth.  It will be located in the
>      middle of the regular exhibition space together with business
>      booths.  After a long time this is another  opportunity
>      to put names and email addresses to faces and personalities.
> +<<<<<<< 0705-linuxtag.wml
> +=======
>  
>      <p>It is planned to organize a Debian Day that would contain
>      interesting talks suited for Debian developers. Aside from these
>      talks, there will be a <a href="http://www.infodrom.ffis.de/Debian/events/LinuxTag2001/debian-joey.html";>general talk</a> introducing into Debian
>      GNU/Linux held by Martin `Joey' Schulze.
>  
> +>>>>>>> 1.6
>  </define-tag>
>  
>  #use wml::debian::past_event

-- 
Linux - the choice of a GNU generation.