Skip to content

Commit c725c47

Browse files
committed
Merge commit '37ab94a5d9162b3af4223566087f5a7174f6b5ac' into go-autoupdate-packages
2 parents 4d31b4e + 37ab94a commit c725c47

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/github.com/getlantern/go-update/update.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ while outputting a progress meter and supports resuming partial downloads.
113113
package update
114114

115115
import (
116-
"github.com/kardianos/osext"
117116
"bytes"
118117
"crypto"
119118
"crypto/rsa"
@@ -122,13 +121,15 @@ import (
122121
"crypto/x509"
123122
"encoding/pem"
124123
"fmt"
125-
"github.com/getlantern/go-update/download"
126-
"github.com/kr/binarydist"
127124
"io"
128125
"io/ioutil"
129126
"net/http"
130127
"os"
131128
"path/filepath"
129+
130+
"github.com/getlantern/go-update/download"
131+
"github.com/kardianos/osext"
132+
"github.com/kr/binarydist"
132133
)
133134

134135
// The type of a binary patch, if any. Only bsdiff is supported

src/github.com/getlantern/go-update/update_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ import (
77
"crypto/rsa"
88
"crypto/x509"
99
"encoding/pem"
10-
"github.com/kr/binarydist"
1110
"io/ioutil"
1211
"net"
1312
"net/http"
1413
"os"
1514
"testing"
15+
16+
"github.com/kr/binarydist"
1617
)
1718

1819
var (

0 commit comments

Comments
 (0)