diff options
author | Silvan Mosberger <contact@infinisil.com> | 2023-10-06 05:09:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-06 05:09:54 +0200 |
commit | b3e14b9045a7805ddde2790652744b731caebaaf (patch) | |
tree | de36c0d4518bc03a6b1e9c72628257b39b29c9ac /pkgs/applications/office | |
parent | fbe363043b4099aca51f67cc6b715404e8d871dd (diff) | |
parent | 004da0cf9140d016904a4f0087c3c5b96ecef0ab (diff) | |
download | nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.gz nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.bz2 nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.lz nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.xz nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.tar.zst nixpkgs-b3e14b9045a7805ddde2790652744b731caebaaf.zip |
Merge pull request #259074 from tweag/detect-merge-conflicts
workflows/check-by-name: Better error for merge conflicts
Diffstat (limited to 'pkgs/applications/office')
0 files changed, 0 insertions, 0 deletions