fixup! v2 etcdctl backup: producing consistent state of membership

etcd-io · Apr 27, 2021 · dd73aba · dd73aba
1 parent 9374308
commit dd73aba
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/etcdctl/snapshot/v3_snapshot.go b/etcdctl/snapshot/v3_snapshot.go
@@ -477,5 +477,4 @@ func (s *v3Manager) updateCIndex(commit uint64) error {
 	ci.SetConsistentIndex(commit)
 	ci.UnsafeSave(be.BatchTx())
 	return nil
->>>>>>> 1e4160ac4 (fixup! v2 etcdctl backup: producing consistent state of membership)
 }