fix conflict

2022-01-09 20:32:07 +01:00
parent 33f99791dd
commit 6a05e15bf1
4 changed files with 25 additions and 23 deletions
--- a/server/clamav.go
+++ b/server/clamav.go
@ -34,8 +34,8 @@ import (
 	"net/http"
 	"time"

-	"github.com/gorilla/mux"
 	clamd "github.com/dutchcoders/go-clamd"
+	"github.com/gorilla/mux"
 )

 const clamavScanStatusOK = "OK"