Merge remote-tracking branch 'origin/write_err_panic' into write_err_panic

# Conflicts: # plugin/store/kvmvcc/kvmvccdb.go

Merge remote-tracking branch 'origin/write_err_panic' into write_err_panic
19c38a37 · liuyuhang · aa69a170 · eae95cac · 19c38a37
Commit 19c38a37 authored Jun 22, 2019 by liuyuhang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

kvmvccdb.go plugin/store/kvmvcc/kvmvccdb.go +0 -1

No files found.
--- a/plugin/store/kvmvcc/kvmvccdb.go
+++ b/plugin/store/kvmvcc/kvmvccdb.go
@@ -5,7 +5,6 @@
 package kvmvccdb
 import (
 	"github.com/33cn/chain33/common"
 	dbm "github.com/33cn/chain33/common/db"
 	clog "github.com/33cn/chain33/common/log"