doc: update readme.md

noneback · Sep 27, 2024 · e4be081 · e4be081
1 parent acc4a59
commit e4be081
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/readme.md b/readme.md
@@ -3,8 +3,13 @@ A static DAG Task Computing Framework with taskflow-styled api.
 
 ## Feature
 - User-friendly programming interface
+<<<<<<< HEAD
 - Subflow supported
 - DAG to dot visualization
+=======
+- Static Tasking and Subflow Tasking supported
+- Taskflow visualization
+>>>>>>> 0a4ffa7 (doc: update readme.md)
 
 ## Example
 ```go