Fix rebase

matteosuppo · matteosuppo · commit 34fafb7221b9 · 2016-05-04T15:39:25.000+02:00
diff --git a/conn.go b/conn.go
@@ -79,7 +79,7 @@ func uploadHandler(c *gin.Context) {
 		return
 	}
 
-	if extraInfo.networkPort {
+	if data.Extra.Network {
 		err := verifyCommandLine(data.Commandline, data.Signature)
 
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func uploadHandler(c *gin.Context) {`
`79`	`79`	`return`
`80`	`80`	`}`
`81`	`81`
`82`		`- if extraInfo.networkPort {`
	`82`	`+ if data.Extra.Network {`
`83`	`83`	`err := verifyCommandLine(data.Commandline, data.Signature)`
`84`	`84`
`85`	`85`	`if err != nil {`