[doc] Update overview.md

apache · Oct 26, 2023 · 9952091 · 9952091
1 parent 4c0023f
commit 9952091
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/docs/content/engines/overview.md b/docs/content/engines/overview.md
@@ -35,8 +35,7 @@ Apache Spark and Apache Hive.
 | Engine |    Version    | Batch Read | Batch Write | Create Table | Alter Table | Streaming Write | Streaming Read | Batch Overwrite |
 |:------:|:-------------:|:----------:|:-----------:|:------------:|:-----------:|:---------------:|:--------------:|:---------------:|
 | Flink  |  1.14 - 1.18  |     ✅      |      ✅      |      ✅       |  ✅(1.17+)   |        ✅        |       ✅        |        ✅        |
-| Spark  |   3.1 - 3.5   |     ✅      |      ✅      |      ✅       |      ✅      |        ✅         |    ✅(3.3+)     |        ❌        |
->>>>>>> 63465c879 ([flink] Update Flink to 1.18.0)
+| Spark  |   3.1 - 3.5   |     ✅      |      ✅      |      ✅       |      ✅      |        ✅        |    ✅(3.3+)     |        ❌        |
 |  Hive  |   2.1 - 3.1   |     ✅      |      ✅      |      ✅       |      ❌      |        ❌        |       ❌        |        ❌        |
 | Spark  |      2.4      |     ✅      |      ❌      |      ❌       |      ❌      |        ❌        |       ❌        |        ❌        |
 | Trino  |   358 - 422   |     ✅      |      ❌      |      ✅       |      ✅      |        ❌        |       ❌        |        ❌        |