Re: r28084 - trunk/installer/doc/manual/po/el
On Tue, May 31, 2005 at 05:55:08PM +0000, Emmanuel Galatoulas wrote:
> Added: trunk/installer/doc/manual/po/el/boot-new.po
> ==============================================================================
> --- (empty file)
> +++ trunk/installer/doc/manual/po/el/boot-new.po Tue May 31 17:55:07 2005
> @@ -0,0 +1,1835 @@
> +<<<<<<< .mine
> +# translation of boot-new.po to
> +# translation of boot-new.po to
> +# translation of boot-new.po to
> +# translation of boot-new.po to
> +# translation of boot-new.po to
> +# translation of boot-new.po to
> +=======
> +# translation of boot-new.po to
> +# translation of boot-new.po to
> +# translation of boot-new.po to
> +>>>>>>> .r28082
> +# translation of boot-new.po to Greek
> +# Copyright (C) 2005 Free Software Foundation, Inc.
> +# Emmanuel Galatoulas <galas@tee.gr>, 2005.
You may want to fix your conflicts before you commit ;-)
--
The amount of time between slipping on the peel and landing on the
pavement is precisely one bananosecond
Reply to: