fix conflict

3 jobs for master in 6 minutes and 58 seconds (queued for 8 minutes and 26 seconds)
Status Job ID Name Coverage
  Prep
passed #212538792
srpm

00:03:36

 
  Build
canceled #212538793
rpm

00:03:21

 
  Repo
skipped #212538794
repo