Re: [Emc-developers] Merge Conflicts

2023-06-19 Thread gene heskett
On 6/19/23 02:40, Phill Carter via Emc-developers wrote: On 19 Jun 2023, at 4:35 pm, Hans Unzner 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

Re: [Emc-developers] Merge Conflicts

2023-06-18 Thread Phill Carter via Emc-developers
> On 19 Jun 2023, at 4:35 pm, Hans Unzner 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. >> >> Chee

Re: [Emc-developers] Merge Conflicts

2023-06-18 Thread Hans Unzner
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 ___ Emc-

[Emc-developers] Merge Conflicts

2023-06-18 Thread 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 ___ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://list