MISP
/
misp-objects
mirror of https://github.com/MISP/misp-objects
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [restore] file

pull/291/head
Alexandre Dulaunoy 2020-09-03 12:01:26 +02:00
parent b0ef3a0c21
commit 1d870bf238
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
objects/keybase-account/definition.json
View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
{
"name": "keybase-account",
"meta-category": "",
@ -50,4 +48,3 @@
}
}
}
>>>>>>> parent of 3224f78... added description field in attributes