--===============0531762517==
Content-Type: multipart/signed;
boundary="nextPart2191345.xIHZxdpJd5";
protocol="application/pgp-signature";
micalg=pgp-sha1
Content-Transfer-Encoding: 7bit

--nextPart2191345.xIHZxdpJd5
Content-Type: text/plain;
charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Le Mardi 26 Juillet 2005 15:47, Friedrich W. H. Kossebau a =C3=A9crit=C2=A0:
> Being a subversion-newbie I wonder how to deal with that: Just remove the
> conflicting directory locally (even if I never touched it)? Anything else
> to do, like in the subversion data?


AFAIK you can just remove the conflicting directory locally and update agai=
n.

Regards.
=2D-=20
K=C3=A9vin 'ervin' Ottens, http://ervin.ipsquad.net
"Ni le ma=C3=AEtre sans disciple, Ni le disciple sans ma=C3=AEtre,
Ne font reculer l'ignorance."

--nextPart2191345.xIHZxdpJd5
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQBC5kHtB0u7y43syeIRAmNxAJ48CsoMATuKGNeQBgg8XB mGCWvPxQCdFQ7N
spQsITmYxpOrGE2+he9mhH8=
=VNwD
-----END PGP SIGNATURE-----

--nextPart2191345.xIHZxdpJd5--

--===============0531762517==
Content-Type: text/plain; charset="iso-8859-1"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

=

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscrib=

e <<

--===============0531762517==--