Skip to content
Unverified Commit 1c87fd82 authored by Dario Bertini's avatar Dario Bertini
Browse files

Fix python-packages.nix conflict 

Merge remote-tracking branch 'origin/master' into ansible-win
parents 99912bbf 046ba6b7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment