On Tue, Jan 30, 2018 at 8:14 PM, Daniel Gustafsson <daniel@yesql.se> wrote:
After <DE5BEE53-FC89-4E15-BB09-43E96E679479@yesql.se> I noticed a few more small things in the 10.0 presskit, and realized I never reviewed it when it was published. Attached are a few follow-up patches fixing the markup and some other details.
0001 - Rename OSX to macOS to match the rest of the site 0002 - Fix various markup errors 0003 - Use https:// rather than http:// for postgresql.org links 0004 - Fix incorrect attribute separator in tags
1 and 3 apply fine, and have been pushed.
2 and 4 both have conflicts. Did you create them off the wrong branch or something?