Fix rebase build errors.

Azure · Jun 7, 2022 · ec04d04 · ec04d04
1 parent 31d4748
commit ec04d04
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/jobsAdmin/init.go b/jobsAdmin/init.go
@@ -24,14 +24,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/Azure/azure-storage-azcopy/v10/ste"
 	"io/ioutil"
 	"math"
 	"net/http"
 	"time"
 
 	"github.com/Azure/azure-pipeline-go/pipeline"
+
 	"github.com/Azure/azure-storage-azcopy/v10/common"
+	"github.com/Azure/azure-storage-azcopy/v10/ste"
 )
 
 var steCtx = context.Background()

diff --git a/ste/jobStatusManager.go b/ste/jobStatusManager.go
@@ -23,6 +23,8 @@ package ste
 import (
 	"time"
 
+	"github.com/Azure/azure-pipeline-go/pipeline"
+
 	"github.com/Azure/azure-storage-azcopy/v10/common"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,8 @@ package ste @@
     import (
     	"time"
+    	"github.com/Azure/azure-pipeline-go/pipeline"
     	"github.com/Azure/azure-storage-azcopy/v10/common"
     )
@@ Expand Down @@