Skip to content

Commit 30145c2

Browse files
myleshortonclaude
andcommitted
Fix duplicate imports and whitespace in register.go and proxy.go
Deduplicate algeneva and water imports that were added twice in register.go (merge conflict artifact). Fix spaces-to-tab indentation for TypeSamizdat in proxy.go. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent be1722f commit 30145c2

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

constant/proxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const (
44
TypeAmnezia = "amnezia"
55
TypeALGeneva = "algeneva"
66
TypeOutline = "outline"
7-
TypeSamizdat = "samizdat"
7+
TypeSamizdat = "samizdat"
88
TypeWATER = "water"
99
TypeUnbounded = "unbounded"
1010
)

protocol/register.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ import (
1212
"github.com/getlantern/lantern-box/protocol/algeneva"
1313
"github.com/getlantern/lantern-box/protocol/amnezia"
1414
"github.com/getlantern/lantern-box/protocol/group"
15-
"github.com/getlantern/lantern-box/protocol/unbounded"
16-
"github.com/getlantern/lantern-box/protocol/water"
17-
18-
"github.com/getlantern/lantern-box/protocol/algeneva"
1915
"github.com/getlantern/lantern-box/protocol/outline"
2016
"github.com/getlantern/lantern-box/protocol/samizdat"
17+
"github.com/getlantern/lantern-box/protocol/unbounded"
2118
"github.com/getlantern/lantern-box/protocol/water"
2219
)
2320

0 commit comments

Comments
 (0)