incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Schaefer <joe_schae...@yahoo.com>
Subject Re: CMS diff: Pakiet biurowy OpenOffice.org po polsku
Date Sat, 21 Jul 2012 16:32:41 GMT
You did the right thing in resolving the conflict.
I looked at your working copy and other than there
being 2 <title> sections for the page it looks ready
to commit.



----- Original Message -----
> From: Kay Schenk <kay.schenk@gmail.com>
> To: ooo-dev@incubator.apache.org
> Cc: 
> Sent: Saturday, July 21, 2012 12:24 PM
> Subject: Re: CMS diff: Pakiet biurowy OpenOffice.org po polsku
> 
> On Fri, Jul 20, 2012 at 3:11 PM, Dave Fisher <dave2wave@comcast.net> 
> wrote:
> 
>>  Oops, I had got into anonymous mode.
>> 
> 
> Well OK...I am STILL trying to fix this and running into "conflict"
> problems -- huh, wah!? :(
> 
> Later...things to do for a few hours.
> 
> 
> 
>> 
>>  On Jul 20, 2012, at 3:08 PM, There were three lines of mismatched tags
>>  wrote:
>> 
>>  > Clone URL (Committers only):
>>  >
>> 
> https://cms.apache.org/redirect?new=anonymous;action=diff;uri=http://ooo-site.apache.org/pl%2Findex.html
>>  >
>>  > There were three lines of mismatched tags
>>  >
>>  > Index: trunk/content/pl/index.html
>>  > ===================================================================
>>  > --- trunk/content/pl/index.html       (revision 1363590)
>>  > +++ trunk/content/pl/index.html       (working copy)
>>  > @@ -42,8 +42,6 @@
>>  > </head>
>>  > <body>
>>  >
>>  > -</div>
>>  > -</td></tr></table>
>>  > <table id="mainpl"><tr>
>>  > <td id="menu">
>>  >   <a href="http://pl.openoffice.org" 
> id="stronaglowna"></a>
>>  >
>> 
>> 
> 
> 
> -- 
> ----------------------------------------------------------------------------------------
> MzK
> 
> "I would rather have a donkey that takes me there
> than a horse that will not fare."
>                                           -- Portuguese proverb
> 

Mime
View raw message