Carl Beekhuizen 28a3e54db0 Actually resolve some merge conflicts

2019-06-18 15:13:04 +02:00

..

0_beacon-chain.md

Merge branch 'dev' into JustinDrake-patch-14

2019-06-17 16:33:59 -06:00

0_deposit-contract.md

Address Danny's comments

2019-06-10 15:55:08 +01:00

0_fork-choice.md

Actually resolve some merge conflicts

2019-06-18 15:13:04 +02:00

1_custody-game.md

Cleanup containers

2019-06-09 20:41:21 +01:00

1_shard-data-chains.md

Merge conflicts on dev

2019-06-17 22:09:43 -04:00