Sync main and rebase

- Made a slight mess in the history with conflicts, apologies
tempoCollaboration · Nov 11, 2024 · 4ca4587 · 4ca4587
1 parent f25a100
commit 4ca4587
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 55 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -1,7 +1,11 @@
 # Development
 
+<<<<<<< HEAD
 The following features are under active development:
 The current development branch "dev/jax" implements
+=======
+The following feautres are under active development:
+>>>>>>> 50997c1 (manual sync main)
 
 * [Experimental Support for GPUs/TPUs](#experimental-support-for-gpustpus)
 

diff --git a/docs/pages/gpu_features.rst b/docs/pages/gpu_features.rst