Skip to content

Commit 619b86f

Browse files
committed
fix: wrong merge conflict resolution
1 parent 244162d commit 619b86f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

v0.5/Cargo.lock

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

v0.5/fastn-mail/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ authors.workspace = true
66
license.workspace = true
77
repository.workspace = true
88
homepage.workspace = true
9+
description = "SMTP and IMAP implementation for fastn p2p email"
910

1011
[dependencies]
1112
automerge.workspace = true
1213
autosurgeon.workspace = true
1314
chrono.workspace = true
14-
description = "SMTP and IMAP implementation for fastn p2p email"
1515
eyre.workspace = true
1616
fastn-automerge.workspace = true
1717
fastn-id52 = { workspace = true, features = ["automerge"] }

0 commit comments

Comments
 (0)