Fixup botched merge

1 files changed, 0 insertions, 17 deletions

diff --git a/lib/backupstore/BackupStoreCheckData.cpp b/lib/backupstore/BackupStoreCheckData.cpp
index c89b5082..ec606d52 100644
--- a/lib/backupstore/BackupStoreCheckData.cpp
+++ b/lib/backupstore/BackupStoreCheckData.cpp
@@ -65,23 +65,11 @@ void BackupStoreCheck::AddID(BackupStoreCheck_ID_t ID,
 	if(mpInfoLastBlock == 0 || mInfoLastBlockEntries >= BACKUPSTORECHECK_BLOCK_SIZE)
 	{
 		// No. Allocate a new one
-<<<<<<< HEAD
-		IDBlock *pblk = (IDBlock*)::malloc(sizeof(IDBlock));
-=======
 		IDBlock *pblk = (IDBlock*)calloc(1, sizeof(IDBlock));
->>>>>>> 0.12
 		if(pblk == 0)
 		{
 			throw std::bad_alloc();
 		}
-<<<<<<< HEAD
-		// Zero all the flags entries
-		for(int z = 0; z < (BACKUPSTORECHECK_BLOCK_SIZE * Flags__NumFlags / Flags__NumItemsPerEntry); ++z)
-		{
-			pblk->mFlags[z] = 0;
-		} 
-=======
->>>>>>> 0.12
 		// Store in map
 		mInfo[ID] = pblk;
 		// Allocated and stored OK, setup for use
@@ -148,13 +136,8 @@ BackupStoreCheck::IDBlock *BackupStoreCheck::LookupID(BackupStoreCheck_ID_t ID,
 		pblock = ib->second;
 	}
 
-<<<<<<< HEAD
-	ASSERT(pblock != 0);
-	if(pblock == 0) return 0;
-=======
 	if(pblock == 0) return 0;
 	ASSERT(pblock != 0);
->>>>>>> 0.12
 	
 	// How many entries are there in the block
 	int32_t bentries = (pblock == mpInfoLastBlock)?mInfoLastBlockEntries:BACKUPSTORECHECK_BLOCK_SIZE;