From ce50a83e53c135f563ab6c5560651075b0dbb879 Mon Sep 17 00:00:00 2001
From: arq5x <arq5x@virginia.edu>
Date: Sat, 1 Feb 2014 19:36:35 -0500
Subject: [PATCH] fix conflict.

---
 src/utils/FileRecordTools/RecordOutputMgr.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/utils/FileRecordTools/RecordOutputMgr.h b/src/utils/FileRecordTools/RecordOutputMgr.h
index 69b977b7..16b6cb53 100644
--- a/src/utils/FileRecordTools/RecordOutputMgr.h
+++ b/src/utils/FileRecordTools/RecordOutputMgr.h
@@ -26,7 +26,6 @@ public:
 
 	void printRecord(const Record *record);
 	void printRecord(RecordKeyList &keyList);
-	// Added by ARQ
 	void printRecord(const Record *record, const QuickString & value);
 
 	//where necessary, pass additional information about splits through the blockMgr.
@@ -70,4 +69,4 @@ private:
 	void flush();
 };
 
-#endif /* RECORDOUTPUTMGR_H_ */
+#endif /* RECORDOUTPUTMGR_H_ */
\ No newline at end of file
-- 
GitLab