There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools* (reorganizing code vs. modifying it) I hope I really got it right.
There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools* (reorganizing code vs. modifying it) I hope I really got it right.