Conflicts: pkgs/applications/networking/browsers/firefox/common.nix between f6c5761935 and a373324120.
f6c5761935
a373324120