projects
/
lightning.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
When not saving incomplete tilevars, still save hashes/indexes.
[lightning.git]
/
merge.go
diff --git
a/merge.go
b/merge.go
index c51dcc8dee9f47ef4c2ac72aad090b193f69abeb..1807393b593b7d2c4e59ac3b138e3532b977391b 100644
(file)
--- a/
merge.go
+++ b/
merge.go
@@
-127,8
+127,8
@@
func (cmd *merger) doMerge() error {
cmd.errs = make(chan error, 1)
cmd.tilelib = &tileLibrary{
- encoder:
encoder,
-
include
NoCalls: true,
+ encoder: encoder,
+
retain
NoCalls: true,
}
cmd.mapped = map[string]map[tileLibRef]tileVariantID{}