diff options
| author | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-02-10 09:01:02 +0100 |
|---|---|---|
| committer | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-02-12 18:16:47 +0100 |
| commit | d5dcbc38984cdbcdbcdf289e0b7f55df5f91b581 (patch) | |
| tree | 90cf6d3d29f47f74802a6eb551051fc94640059a /lang/python/python-stem | |
| parent | d8974e8cb49647ec83e95c5fe0c128a462557828 (diff) | |
nginx-util: resolve recursive CONFLICTS
Plus change the TITLE that it fits.
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Diffstat (limited to 'lang/python/python-stem')
0 files changed, 0 insertions, 0 deletions