Remove leftover from git merge

quarkslab · Aug 28, 2023 · bd56bb9 · bd56bb9
1 parent ea8331a
commit bd56bb9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/differs/bindiff.rst b/differs/bindiff.rst
@@ -1,7 +1,6 @@
 Bindiff
 =======
 
-<<<<<<< HEAD
 `BinDiff <https://www.zynamics.com/bindiff.html>`_ is one of the oldest and most
 widely used differ in the reverse engineering community. First conceived at Zynamics,
 it was then acquired by Google. This differ is based on properties of CallGraph to