Skip to content

Commit 51a6962

Browse files
piperfwpiperfw
committed
Sync main and rebase
- Made a slight mess in the history with conflicts, apologies
1 parent 82e5459 commit 51a6962

File tree

2 files changed

+4
-55
lines changed

2 files changed

+4
-55
lines changed

‎DEVELOPMENT.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Development
22

3+
<<<<<<< HEAD
34
The following features are under active development:
45
The current development branch "dev/jax" implements
6+
=======
7+
The following feautres are under active development:
8+
>>>>>>> 50997c1 (manual sync main)
59
610
* [Experimental Support for GPUs/TPUs](#experimental-support-for-gpustpus)
711

‎docs/pages/gpu_features.rst‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)