Resolve merge conflicts

dfinity · Apr 20, 2021 · 7e95b52 · 7e95b52
2 parents ea472a3 + d174393
commit 7e95b52
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/crypto/crypto.go b/crypto/crypto.go
@@ -37,8 +37,8 @@ func DeriveGrandchildECKeyPair(
 	// First apply the change.
 	childXPrivKey, err := masterXPrivKey.Derive(0)
 	if err != nil {
-                return nil, nil, err
-        }
+		return nil, nil, err
+	}
 	grandchildXPrivKey, err := childXPrivKey.Derive(i)
 	if err != nil {
 		return nil, nil, err