Commit ba2f9015 authored by Georgius's avatar Georgius
Browse files

Merge conflict resolved in .gitignore

parents a91dcfaa 0fda3d4d
Pipeline #10360 passed with stage
in 1 minute and 41 seconds