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

delete forgotten conflict marker

pull/239/head
Deborah Servili 2018-08-06 08:49:44 +02:00
parent 010df0a2b6
commit b7de06ffcc
No known key found for this signature in database
GPG Key ID: 7E3A832850D4D7D1
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clusters/threat-actor.json
View File

@ -3765,7 +3765,6 @@
"https://research.checkpoint.com/apt-attack-middle-east-big-bang/",
"https://blog.talosintelligence.com/2017/06/palestine-delphi.html"
]
<<<<<<< HEAD
}
},
{