I just hit a merge conflict in a powerpoint file that s a ne Dendron #chat

I just hit a merge conflict in a powerpoint file, ...

r

rlh1994

07/05/2022, 7:03 PM

I just hit a merge conflict in a powerpoint file, that's a new one 🤣