Rebase merge conflicts

Willow Liquorice <[email protected]>
Newsgroups gmane.network.gnunet.devel
Message-ID <[email protected]> 
Hello,

I'm currently rebasing a load of changes to the Doxygen, and I've ran 
into a merge conflict that I can't disentangle: 
GNUNET_GNSRECORD_convert_records_for_export is present on my branch but 
not on master. Was it removed?

Best wishes,
	Willow
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.