Closed SierraTango1920 closed 1 year ago
This was indeed a conflict I had while cherry-picking. I seem to have a bad habit of 'well, while I'm here' while resolving conflicts. The change I made to that manual was changing the font size slightly so that it fit in page boundaries, as the curly apostrophe is slightly wider than the typographical one, so it caused an additional line wrap in one of the paragraphs. That was in fact the first time I encountered the apostrophe change causing a line wrap, but now I have concerns that it almost certainly happened elsewhere. I assume this is something you look at as part of approving these changes though, so it should be fine. In addition, looking through the rest of the file, there were things I was unhappy with so I changed them in addition to the apostrophes. Apologies if it made anything more confusing.
FYI, you accidentally changed
Logic Gates translated (Français — Portes logiques)
, I think you accepted the wrong changes when you merged.