[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: kdelibs/kabc/plugins/ldap
From:       David Faure <dfaure () klaralvdalens-datakonsult ! se>
Date:       2003-01-05 17:21:19
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Sunday 05 January 2003 18:15, Ian Reinhart Geiser wrote:
> +<<<<<<< resourceldap.cpp
> +  mLdap = ldap_init( mHost.local8Bit().data(), mPort.toInt() );
> +=======
>    mLdap = ldap_init( mHost.local8Bit(), mPort );
> +>>>>>>> 1.15

It looks like you committed a conflict.... 

- -- 
David Faure -- faure@kde.org, dfaure@klaralvdalens-datakonsult.se
Klarälvdalens Datakonsult AB, Platform-independent software solutions
Contributing to: http://www.konqueror.org/, http://www.koffice.org/
KOffice-1.2.1 is available - http://download.kde.org/stable/koffice-1.2.1/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE+GGmP72KcVAmwbhARAktEAKCeE4F53z4PdAwAkJ5SsO98CGNaQgCeOdcj
gRTEnZ1bvlxDQ6CnxNweZ0s=
=Tofq
-----END PGP SIGNATURE-----

[prev in list] [next in list] [prev in thread] [next in thread]