Fix merge issue

ItsOnlyBinary · ItsOnlyBinary · commit 517cd32436e1 · 2020-12-22T13:45:00.000Z
diff --git a/server/uploadserver.go b/server/uploadserver.go
@@ -74,12 +74,12 @@ func (serv *UploadServer) Run(replaceableHandler *ReplaceableHandler) error {
 		serv.log,
 	)
 
-	err = serv.registerWebPreviewHandlers(serv.Router, serv.cfg)
+	err := serv.registerWebPreviewHandlers(serv.Router, serv.cfg)
 	if err != nil {
 		return err
 	}
 
-	err := serv.registerTusHandlers(serv.Router, serv.store)
+	err = serv.registerTusHandlers(serv.Router, serv.store)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -74,12 +74,12 @@ func (serv UploadServer) Run(replaceableHandler ReplaceableHandler) error {`
`74`	`74`	`serv.log,`
`75`	`75`	`)`
`76`	`76`
`77`		`- err = serv.registerWebPreviewHandlers(serv.Router, serv.cfg)`
	`77`	`+ err := serv.registerWebPreviewHandlers(serv.Router, serv.cfg)`
`78`	`78`	`if err != nil {`
`79`	`79`	`return err`
`80`	`80`	`}`
`81`	`81`
`82`		`- err := serv.registerTusHandlers(serv.Router, serv.store)`
	`82`	`+ err = serv.registerTusHandlers(serv.Router, serv.store)`
`83`	`83`	`if err != nil {`
`84`	`84`	`return err`
`85`	`85`	`}`