fixed av-signature merge conflicts with upstream

objects/file/definition.json

@@ -130,9 +130,22 @@
       "disable_correlation": true,
       "ui-priority": 0,
       "misp-attribute": "text"
+    },
+    "state": {
+      "misp-attribute": "text",
+      "ui-priority": 0,
+      "description": "State of the file",
+      "multiple": true,
+      "values_list": [
+        "Harmless",
+        "Signed",
+        "Revoked",
+        "Expired",
+        "Trusted"
+      ]
     }
   },
-  "version": 3,
+  "version": 4,
   "description": "File object describing a file with meta-information",
   "meta-category": "file",
   "uuid": "688c46fb-5edb-40a3-8273-1af7923e2215",

tools/adoc_objects.py

@@ -87,7 +87,7 @@ def asciidoc(content=False, adoc=None, t='title',title=''):
                     disableCorrelation = 'icon:check[] '
             if 'description' in content['attributes'][v]:
                 if content['attributes'][v]['description']:
-                    values = ''
+                    description = '{}'.format(content['attributes'][v]['description'])
                 if 'values_list' in content['attributes'][v]:
                     values = content['attributes'][v]['values_list']
                     description = '{} {}'.format(content['attributes'][v]['description'],values)