fix typo in DEVELOPMENT.md

piperfw · piperfw · commit 9d2c16e52302 · 2024-11-11T11:29:59.000-08:00
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -1,11 +1,6 @@
 # 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)
 
