Resolving merge conflicts

Signed-off-by: Ishant Thakare <[email protected]>
securefederatedai · Dec 20, 2024 · 7f16cdb · 7f16cdb
1 parent eff79fc
commit 7f16cdb
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 200 deletions.
diff --git a/docs/source/api/openfl_component.rst b/docs/source/api/openfl_component.rst
diff --git a/docs/source/api/openfl_cryptography.rst b/docs/source/api/openfl_cryptography.rst
diff --git a/docs/source/api/openfl_databases.rst b/docs/source/api/openfl_databases.rst
diff --git a/docs/source/api/openfl_experimental.rst b/docs/source/api/openfl_experimental.rst
diff --git a/docs/source/api/openfl_federated.rst b/docs/source/api/openfl_federated.rst
diff --git a/docs/source/api/openfl_interface.rst b/docs/source/api/openfl_interface.rst
diff --git a/docs/source/api/openfl_native.rst b/docs/source/api/openfl_native.rst
diff --git a/docs/source/api/openfl_pipelines.rst b/docs/source/api/openfl_pipelines.rst
diff --git a/docs/source/api/openfl_plugins.rst b/docs/source/api/openfl_plugins.rst
diff --git a/docs/source/api/openfl_protocols.rst b/docs/source/api/openfl_protocols.rst
diff --git a/docs/source/api/openfl_transport.rst b/docs/source/api/openfl_transport.rst
diff --git a/docs/source/api/openfl_utilities.rst b/docs/source/api/openfl_utilities.rst
diff --git a/docs/source/openfl/director_workflow.svg b/docs/source/openfl/director_workflow.svg
diff --git a/docs/source/openfl/static_diagram.svg b/docs/source/openfl/static_diagram.svg