message: Fixed a makefile typo
diff: @@ -480,11 +480,7 @@ build/drush-alias: build/nginx
  build/keycloak: build/commons
  build/harbor-database: build/postgres
  build/harbor-clair: build/harbor-database services/harbor-redis/Dockerfile
  -<<<<<<< HEAD
  -build/harborregistry: build/harbor-clair services/harbor-clairadapter services/harbor-jobservice/Dockerfile
  -=======
  -build/harborregistry: build/harbor-clair services/harbor-jobservice/Dockerfile
  ->>>>>>> master
  +build/harborregistry: build/harbor-clair services/harbor-clairadapter/Dockerfile services/harbor-jobservice/Dockerfile
  build/harborregistryctl: build/harborregistry
  build/harbor-nginx: build/harborregistryctl services/harbor-core/Dockerfile services/harbor-portal/Dockerfile
  