Fixed merge conflicts

2023-07-06 17:39:40 +02:00
parent 6e405e781c 77a59537bd
commit 38fe58f1b6
209 changed files with 1826 additions and 68 deletions
@@ -534,7 +534,7 @@ func getDockerImage(resp http.ResponseWriter, request *http.Request) {
 	if len(img.ID) == 0 {
 		if len(img2.ID) == 0 {
 			workflowapps, err := shuffle.GetAllWorkflowApps(ctx, 0, 0)
-			//log.Printf("[INFO] Getting workflowapps for a rebuild. Got %d with err %#v", len(workflowapps), err)
+			log.Printf("[INFO] Getting workflowapps for a rebuild. Got %d with err %#v", len(workflowapps), err)
 			if err == nil {
 				imageName := ""
 				imageVersion := ""