From cd6830c5e19c181835cab8c64a855a3e61b0941c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 16 Apr 2018 06:07:52 +0300
Subject: [PATCH] Strip git diff

---
 src/main.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3234febea..9840863d2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2635,15 +2635,9 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     std::vector<std::pair<uint256, CDiskTxPos> > vPos;
     vPos.reserve(block.vtx.size());
     blockundo.vtxundo.reserve(block.vtx.size() - 1);
-<<<<<<< variant A
-
     std::vector<std::pair<CAddressIndexKey, CAmount> > addressIndex;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > addressUnspentIndex;
     std::vector<std::pair<CSpentIndexKey, CSpentIndexValue> > spentIndex;
-
->>>>>>> variant B
-    
-======= end
     // Construct the incremental merkle tree at the current
     // block position,
     auto old_tree_root = view.GetBestAnchor();