search

ethereum / cbc-casper

GNU Affero General Public License v3.0
229 stars 44 forks source link

Chore/conflicts #144

Closed naterush closed 6 years ago

naterush commented 7 years ago

Fixes all the merge conflicts between feat/hash_linking and develop. Also moves feat/hash_linking to the new directory structure.

djrtwo commented 6 years ago

merging