Oh duh - there's not going to be a conflict unless you merge in branch-4 to master. So, this can go in whenever.
@esindril - when you get the chance though, can you verify this worked?
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub, or unsubscribe.
Use REPLY-ALL to reply to list
To unsubscribe from the XROOTD-DEV list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1