chore: address issue and conflicts after rebase

maidsafe · Jun 14, 2021 · 81017f8 · 81017f8
1 parent 4c78cb1
commit 81017f8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,4 @@ target/
 .cargo/
 .DS_Store
 .core
-core
+core
diff --git a/src/dkg/commands.rs b/src/dkg/commands.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 MaidSafe.net limited.
+// Copyright 2021 MaidSafe.net limited.
 //
 // This SAFE Network Software is licensed to you under The General Public License (GPL), version 3.
 // Unless required by applicable law or agreed to in writing, the SAFE Network Software distributed

diff --git a/src/agreement/section_signed.rs → src/dkg/section_signed.rs b/src/agreement/section_signed.rs → src/dkg/section_signed.rs
diff --git a/src/dkg/session.rs b/src/dkg/session.rs
@@ -7,8 +7,10 @@
 // permissions and limitations relating to use of the SAFE Network Software.
 
 use crate::{
-    dkg::dkg_msgs_utils::DkgFailureSignedUtils,
-    dkg::{commands::DkgCommand, dkg_msgs_utils::DkgFailureSignedSetUtils},
+    dkg::{
+        commands::DkgCommand,
+        dkg_msgs_utils::{DkgFailureSignedSetUtils, DkgFailureSignedUtils},
+    },
     ed25519::{self, Keypair},
     routing::command,
     section::{SectionAuthorityProviderUtils, SectionKeyShare},

diff --git a/src/dkg/voter.rs b/src/dkg/voter.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 MaidSafe.net limited.
+// Copyright 2021 MaidSafe.net limited.
 //
 // This SAFE Network Software is licensed to you under The General Public License (GPL), version 3.
 // Unless required by applicable law or agreed to in writing, the SAFE Network Software distributed