> On 19 Jun 2023, at 4:35 pm, Hans Unzner <hansunz...@gmail.com> wrote: > > Am 19.06.23 um 05:01 schrieb Phill Carter via Emc-developers: >> Could someone with a bit more knowledge of the documents than me please fix >> the merge conflicts from 2.9 to master. >> >> I have broken enough things recently. >> >> Cheers, Phill >> > Done Thank you. _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
Re: [Emc-developers] Merge Conflicts
Phill Carter via Emc-developers Sun, 18 Jun 2023 23:42:05 -0700
- [Emc-developers] Merge Conflicts Phill Carter via Emc-developers
- Re: [Emc-developers] Merge Conflicts Hans Unzner
- Re: [Emc-developers] Merge Confli... Phill Carter via Emc-developers
- Re: [Emc-developers] Merge Co... gene heskett