Commit 2e681869 by Chif Gergő

Resolve merge conflict in gitignore and Pipfile.lock

parents 31723e86 12683431
Pipeline #820 failed with stage
in 1 minute 19 seconds