1 |
On 20-07-2007 15:11:27 +0900, MATSUI Fe2+ Tetsushi wrote: |
2 |
> At Wed, 18 Jul 2007 10:53:52 +0200, |
3 |
> Fabian Groffen wrote: |
4 |
> > |
5 |
> > Ok, oops that's a merge error :( |
6 |
> > |
7 |
> > Thanks, should be fixed now! |
8 |
> |
9 |
> For 2.3.5, again. |
10 |
|
11 |
Hmmm... why doesn't svn throw a conflict at me there? I guess it's |
12 |
being "smart". |
13 |
|
14 |
I fixed it again. Thanks! |
15 |
(I'm thinking of implementing a repoman check for this so its less |
16 |
likely to happen again ... ) |
17 |
|
18 |
|
19 |
-- |
20 |
Fabian Groffen |
21 |
Gentoo on a different level |
22 |
|
23 |
-- |
24 |
gentoo-alt@g.o mailing list |