attempt to fix merge conflicts no. 2

thomasp85 · Jan 19, 2024 · 6dfa17e · 6dfa17e
1 parent c8a55cf
commit 6dfa17e
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 4 deletions.
diff --git a/man/geom_edge_bundle_force.Rd b/man/geom_edge_bundle_force.Rd
diff --git a/man/geom_edge_bundle_minimal.Rd b/man/geom_edge_bundle_minimal.Rd
diff --git a/man/geom_edge_bundle_path.Rd b/man/geom_edge_bundle_path.Rd
diff --git a/man/geom_edge_sf.Rd b/man/geom_edge_sf.Rd
diff --git a/man/geom_node_sf.Rd b/man/geom_node_sf.Rd
diff --git a/man/ggraph-extensions.Rd b/man/ggraph-extensions.Rd
diff --git a/man/layout_tbl_graph_cactustree.Rd b/man/layout_tbl_graph_cactustree.Rd
diff --git a/man/layout_tbl_graph_htree.Rd b/man/layout_tbl_graph_htree.Rd
diff --git a/man/layout_tbl_graph_sf.Rd b/man/layout_tbl_graph_sf.Rd