projects
/
lightning.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Move command line tool to subdir.
[lightning.git]
/
merge.go
diff --git
a/merge.go
b/merge.go
index 322d62c7f2cee6112f78feeea578adcfd9874f5b..6530d600279655d0a68b9eff2246cd3af9836915 100644
(file)
--- a/
merge.go
+++ b/
merge.go
@@
-1,4
+1,4
@@
-package
main
+package
lightning
import (
"bufio"