> > We both did the same thing. Rev 6e13c60 in devel attempts to fix the > resulting merge conflicts. > > - I picked my version for LeoDocs.leo because that version fixes some > sphinx/rST problems in previous text. >
Should I be editing LeoDocs in a different way or doing something else to avoid merge conflicts? > - I picked your version of MANIFEST.in. Please ensure it as you want it. > I'm glad you said something, it wasn't. This is very strange though because the git log and file history clearly showed the my change was there and not reverted in any subsequent diffs that I could see. Yet, in the fle system the line I added was gone (`include LICENSE`). Anyway, I re-added it (1c197cc). -matt -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/1e05197e-003b-4459-95ab-bc6bc368202e%40googlegroups.com.
