resolved conflicts

This commit is contained in:
marc2332 committed 2023-05-20 22:10:54 +02:00
commit c741a32f4a
164 files changed
+8976 -686

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@ rink = { path = "../rink" }
crossterm = "0.23.0"
tokio = { version = "1.15.0", features = ["full"] }
futures = "0.3.19"
taffy = "0.2.1"
taffy = "0.3.12"
[dev-dependencies]
dioxus = { path = "../dioxus" }