Help with a conflicts when merging honeyd from Debian.

[Oussama Bounaim]

Hi,

I am a bit confused about conflicts that occurred when merging honeyd from
Debian in ltmain.sh.

 <<<<<<< TREE
#         $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1
=======
#         $progname: (GNU libtool) 2.4 Debian-2.4-3
>>>>>>> MERGE-SOURCE
#         automake: $automake_version
#         autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
# General help using GNU software: <http://www.gnu.org/gethelp/>.

PROGRAM=libtool
PACKAGE=libtool
<<<<<<< TREE
VERSION="2.4 Debian-2.4-2ubuntu1"
=======
VERSION="2.4 Debian-2.4-3"
>>>>>>> MERGE-SOURCE

Which version of (GNU libtool) should I keep?
-- 
*My Best Regards,*
* Oussama*
*
*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/ubuntu-motu/attachments/20121102/9ac73aed/attachment.html>