cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Grant Wuerker 2018-12-26 12:13:47 -06:00
parent 34ec2887fb
commit 9040fcf437
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_chain/types/src/lib.rs
View File

@ -19,10 +19,7 @@ pub mod crystallized_state;
pub mod deposit; pub mod deposit;
pub mod deposit_data; pub mod deposit_data;
pub mod deposit_input; pub mod deposit_input;
<<<<<<< HEAD
=======
pub mod exit; pub mod exit;
>>>>>>> master
pub mod fork_data; pub mod fork_data;
pub mod pending_attestation_record; pub mod pending_attestation_record;
pub mod proposal_signed_data; pub mod proposal_signed_data;
@ -49,10 +46,7 @@ pub use crate::crystallized_state::CrystallizedState;
pub use crate::deposit::Deposit; pub use crate::deposit::Deposit;
pub use crate::deposit_data::DepositData; pub use crate::deposit_data::DepositData;
pub use crate::deposit_input::DepositInput; pub use crate::deposit_input::DepositInput;
<<<<<<< HEAD
=======
pub use crate::exit::Exit; pub use crate::exit::Exit;
>>>>>>> master
pub use crate::fork_data::ForkData; pub use crate::fork_data::ForkData;
pub use crate::pending_attestation_record::PendingAttestationRecord; pub use crate::pending_attestation_record::PendingAttestationRecord;
pub use crate::proposal_signed_data::ProposalSignedData; pub use crate::proposal_signed_data::ProposalSignedData;