Apply suggestions from code review

Co-authored-by: Kavindu Dodanduwa <Kavindu-Dodan@users.noreply.github.com> Signed-off-by: Michael Beemer <beeme1mr@users.noreply.github.com>
open-feature · Aug 15, 2023 · fc64a1c · fc64a1c
1 parent 1dc1fb6
commit fc64a1c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/specification.json b/specification.json
@@ -852,11 +852,7 @@
         {
             "id": "Requirement 5.3.4",
             "machine_id": "requirement_5_3_4",
-<<<<<<< HEAD
             "content": "When the provider's `on context changed` is called, `PROVIDER_STALE` handlers MUST run.",
-=======
-            "content": "When the provider's `on context changed`  is called, `PROVIDER_STALE` handlers MUST run.",
->>>>>>> 8d773c0 (chore: review comments)
             "RFC 2119 keyword": "MUST",
             "children": []
         },