fix: resolve conflict

# Conflicts:
#   djangoldp_joboffer/models.py
1 job for jbpasquier/virtualcontainer in 28 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #5862
sib
test

00:00:28