|
| From: | Willow Liquorice |
| Subject: | Rebase merge conflicts |
| Date: | Mon, 3 Oct 2022 13:02:29 +0100 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 |
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
| [Prev in Thread] | Current Thread | [Next in Thread] |