Skip to content
Snippets Groups Projects
Commit ce50a83e authored by arq5x's avatar arq5x
Browse files

fix conflict.

parent 61a63f95
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/utils/FileRecordTools/RecordOutputMgr.h
+ 1
− 2
View file @ ce50a83e
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment