diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-06-16 19:58:58 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-06-16 19:59:05 +0200 |
| commit | e3dfa794412778ab993054a8e0a55a7a5490c022 (patch) | |
| tree | afcfb540333a669269b36adcfcf6def5e7e688ec /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 30915f8d471cba27ec9364135cdcb27f83b52f5d (diff) | |
| parent | b08ae54dd9daf4cceb03d49d681bfbd7ad013bb8 (diff) | |
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions