Closed lonemadmax closed 1 year ago
Not your fault. I pushed them so that each branch applied cleanly over master, but this and the useragent one both had a change in the same area of HttpUtils.cpp. Whatever the order, there would have been a conflict between those.
It looks like there are merge conflicts with your other changes so a rebase is needed. I probably merged things in the wrong order?