Fixed conflict in .gitignore

5 jobs for test/pytest-cov-upstream in 2 minutes and 53 seconds
Status Job ID Name Coverage
  Build
passed #60252
build

00:01:37

 
  Test
passed #60255
lint_js

00:01:12

passed #60256
lint_py

00:00:42

passed #60253
test_js

00:01:13

passed #60254
test_py

00:01:16