[L2Ork-dev] osx version flag

Jonathan Wilkes jon.w.wilkes at gmail.com
Wed Oct 14 11:33:37 EDT 2020


Albert and/or Sam,

I seem to have a dangling merge request for one of Sam's patches here:

https://git.purrdata.net/jwilkes/purr-data/-/merge_requests/550

Gitlab says it conflicts with the main branch. I get a lot of lines of
the yml file being diff'd when I look at the merge.

If I understand correctly, this should basically be a single line `+
  osx_version: 10.8` diff.

I can confirm that line is missing in HEAD.

Does the merge request simply need to be brought up to date with current master?

Thanks,
Jonathan


More information about the L2Ork-dev mailing list