fixed an overlooked conflict (#167)

2026-08-28 03:46:33 +00:00 · 2020-09-24 09:59:24 +02:00
parent f3033c5515
commit 80747a0872
1 changed files with 0 additions and 5 deletions
@@ -695,13 +695,8 @@ func CreateEvidenceForPeer(peer PeerID, root LightBlock, trace LightStore)
            else {
                // the peer agrees with the trace, we move common forward
                // we could delete auxLS as it will be overwritten in
-<<<<<<< HEAD:rust-spec/lightclient/detection/detection_001_reviewed.md
-                // the next iterationt
-                common := trace[i].Header
-=======
                // the next iteration
                common := trace[i]
->>>>>>> bc3d1aff5ba358afb68f1698e5834995662ba74c:rust-spec/lightclient/detection/detection.md
            }
        }
    }