fixes missed merge conflicts

Signed-off-by: Donovan Kolbly <[email protected]>

CHANGELOG.md

@@ -104,7 +104,6 @@ Thankyou! -->
     6. Declared enums in dictionary.json have sane "0" (Unknown) and "99" (Other) declarations and descriptions where appropriate #1111
     7. Adds support for `suppress_checks` controls in attributes to allow tools to automatically validate conventions #1063
         * Updated several attributes that do not follow conventions to disable linting for them
-        * Updated `data_lifecycle_state_id` to add a "99" (Other) enumerand to follow convention
 
 
 ## [v1.2.0] - April 23rd, 2024

dictionary.json

@@ -1254,11 +1254,7 @@
       "enum": {
         "0": {
           "caption": "Unknown",
-          "description": "The lifecycle state is not known."
-        },
-        "99": {
-          "caption": "Other",
-          "description": "The lifecycle state is not mapped. See the <code>data_lifecycle_state</code> attribute, which contains a data source specific value."
+          "description": "The data lifecycle state is unknown."
         },
         "1": {
           "caption": "Data at-Rest",
@@ -2924,7 +2920,6 @@
     "opcode_id": {
       "caption": "DNS Opcode ID",
       "description": "The DNS opcode ID specifies the normalized query message type as defined in <a target='_blank' href='https://www.rfc-editor.org/rfc/rfc5395.html'>RFC-5395</a>.",
-      "description": "The DNS opcode ID specifies the normalized query message type.",
       "suppress_checks": ["enum_convention"],
       "type": "integer_t",
       "enum": {