remove conflict mark

zhiyuanliang-ms · zhiyuanliang-ms · commit 51bcf7336350 · 2023-10-27T11:24:11.000+08:00
diff --git a/README.md b/README.md
@@ -139,7 +139,6 @@ A `RequirementType` of `All` changes the traversal. First, if there are no filte
 ```
 
 In the above example, `FeatureW` specifies a `RequirementType` of `All`, meaning all of it's filters must evaluate to true for the feature to be enabled. In this case, the feature will be enabled for 50% of users during the specified time window.
-<<<<<<< HEAD
 
 ### Status
 
