Cherry-pick fc921a6 with conflicts

frouioui · Oct 24, 2023 · fa80ad1 · fa80ad1
1 parent 18520af
commit fa80ad1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,11 @@
 
 # Vitess 
 
+<<<<<<< HEAD
 Test A
+=======
+Test B
+>>>>>>> fc921a6600 (Update README.md (#108))
 
 Vitess is a database clustering system for horizontal scaling of MySQL
 through generalized sharding.