diff options
| author | jospaeth <spaethj@in.tum.de> | 2020-09-10 14:52:33 +0200 |
|---|---|---|
| committer | jospaeth <spaethj@in.tum.de> | 2020-09-10 14:52:33 +0200 |
| commit | 8ba80868ff3bbe1d8fb6c35663f36cc89f3720da (patch) | |
| tree | 262977a2c4aad3f44e60f4e62992f57854eb12fe /src/consensus/consensus_protocol.h | |
| parent | c11faa7df18e14f447872adda3107a1083f5f127 (diff) | |
| parent | 72331deb3bfed2e82f1d5c87eb185ab67d783308 (diff) | |
| download | gnunet-8ba80868ff3bbe1d8fb6c35663f36cc89f3720da.tar.gz gnunet-8ba80868ff3bbe1d8fb6c35663f36cc89f3720da.zip | |
Merge branch 'master' into spaeth/escrow_plugins
Diffstat (limited to 'src/consensus/consensus_protocol.h')
| -rw-r--r-- | src/consensus/consensus_protocol.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/consensus/consensus_protocol.h b/src/consensus/consensus_protocol.h index a40162fb8..0afd56b27 100644 --- a/src/consensus/consensus_protocol.h +++ b/src/consensus/consensus_protocol.h | |||
| @@ -124,6 +124,7 @@ struct ConsensusSizeElement | |||
| 124 | uint8_t sender_index; | 124 | uint8_t sender_index; |
| 125 | }; | 125 | }; |
| 126 | 126 | ||
| 127 | |||
| 127 | struct ConsensusStuffedElement | 128 | struct ConsensusStuffedElement |
| 128 | { | 129 | { |
| 129 | struct ConsensusElement ce; | 130 | struct ConsensusElement ce; |