From fc64a1c35eb2c4b4d4c0e6bab9e7aca2fcab96d2 Mon Sep 17 00:00:00 2001
From: Michael Beemer <beeme1mr@users.noreply.github.com>
Date: Tue, 8 Aug 2023 15:40:28 -0400
Subject: [PATCH] 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>
---
 specification.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/specification.json b/specification.json
index 03073a8c..bff20c59 100644
--- 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": []
         },