Hi Andrea,

Your last commit has conflicting merge. See <<<<<<<< lines in .tex
files. We have to deal with it manually.
I've made my changes based on your version. I can sync our versions again based on your version.

--
Cin mailing list
[email protected]
https://lists.cinelerra-gg.org/mailman/listinfo/cin

Reply via email to