From b7de06ffccea90f59483ffec7e090f8de3afdde3 Mon Sep 17 00:00:00 2001
From: Deborah Servili <deborah.servili@gmail.com>
Date: Mon, 6 Aug 2018 08:49:44 +0200
Subject: [PATCH] delete forgotten conflict marker

---
 clusters/threat-actor.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/clusters/threat-actor.json b/clusters/threat-actor.json
index 3200c3f..fce5663 100644
--- a/clusters/threat-actor.json
+++ b/clusters/threat-actor.json
@@ -3765,7 +3765,6 @@
           "https://research.checkpoint.com/apt-attack-middle-east-big-bang/",
           "https://blog.talosintelligence.com/2017/06/palestine-delphi.html"
         ]
-<<<<<<< HEAD
       }
     },
     {