Fabian Neumann 70078d03b2 add unresolved merge conflict to be addressed		2021-04-27 16:14:52 +02:00
..
environment.docs.yaml	some refactoring and code cleaning (#190)	2020-12-03 19:50:53 +01:00
environment.fixed.yaml	envs: restore REUSE compliance [skip travis]	2020-12-07 09:45:14 +01:00
environment.yaml	add unresolved merge conflict to be addressed	2021-04-27 16:14:52 +02:00