good morning!!!!

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

B

bor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

1bce02ef

Commit 1bce02ef authored 10 years ago by Jeffrey Wilcke

Downloads
- Plain Diff

Fixed merge

parents 8cf9ed0e a3559c5e

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

chain/block_manager.go 4 additions, 3 deletions

chain/block_manager.go
chain/chain_manager.go 0 additions, 2 deletions

chain/chain_manager.go
chain/genesis.go 0 additions, 2 deletions

chain/genesis.go
chain/state_transition.go 15 additions, 3 deletions

chain/state_transition.go
chain/types/block.go 14 additions, 22 deletions

chain/types/block.go
cmd/ethereum/main.go 2 additions, 1 deletion

cmd/ethereum/main.go
cmd/mist/main.go 1 addition, 1 deletion

cmd/mist/main.go
install.sh 22 additions, 19 deletions

install.sh
miner/miner.go 1 addition, 2 deletions

miner/miner.go
peer.go 1 addition, 1 deletion

peer.go
state/state.go 16 additions, 13 deletions

state/state.go

with 76 additions and 69 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment