fixing accident in merge conflict resolution + black reformatting

3 jobs for archive/pr2409_2020_10_18_two_defines in 0 seconds (queued for 81 minutes and 3 seconds)
Status Job ID Name Coverage
  Build
failed #2679
build

 
  Test
failed #2681
allowed to fail
code_quality

failed #2680
test

 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
code_quality Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
test Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log