diff options
| author | Marius Bakke <marius@gnu.org> | 2022-01-18 17:11:38 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-01-18 19:35:54 +0100 |
| commit | 93006e55073dbe26f26fedbf63ec397cb01a4575 (patch) | |
| tree | ae83351316a8a1874e0ebcf381557d43bb051b19 /etc | |
| parent | 1bd250783d7118c3101dd2a6e090f3d6904b24a0 (diff) | |
| download | guix-93006e55073dbe26f26fedbf63ec397cb01a4575.tar.gz | |
gnu: Adjust merge resolution.
Commit 276f40fdc349d2ad62582b23ea55e061b689cfc0 added unnecessary changes to these variables. * gnu/packages/openstack.scm (python-os-testr)[propagated-inputs]: Remove everything except PYTHON-STESTR. [native-inputs]: Add PYTHON-BABEL, PYTHON-TESTREPOSITORY and PYTHON-TESTTOOLS. * gnu/packages/python-xyz.scm (python-platformdirs)[arguments]: Remove obsolete phase. Run pytest verbosely. [native-inputs]: Remove PYTHON-PYTEST-COV.
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions