Fixup botched merge

1 files changed, 0 insertions, 43 deletions

diff --git a/lib/common/FdGetLine.h b/lib/common/FdGetLine.h
index 6b609fe8..2b9c268f 100644
--- a/lib/common/FdGetLine.h
+++ b/lib/common/FdGetLine.h
@@ -12,23 +12,7 @@
 
 #include <string>
 
-<<<<<<< HEAD
-#ifdef BOX_RELEASE_BUILD
-	#define FDGETLINE_BUFFER_SIZE		1024
-#elif defined WIN32
-	// need enough space for at least one unicode character 
-	// in UTF-8 when calling console_read() from bbackupquery
-	#define FDGETLINE_BUFFER_SIZE		5
-#else
-	#define FDGETLINE_BUFFER_SIZE		4
-#endif
-
-// Just a very large upper bound for line size to avoid
-// people sending lots of data over sockets and causing memory problems.
-#define FDGETLINE_MAX_LINE_SIZE			(1024*256)
-=======
 #include "GetLine.h"
->>>>>>> 0.12
 
 // --------------------------------------------------------------------------
 //
@@ -38,41 +22,15 @@
 //		Created: 2003/07/24
 //
 // --------------------------------------------------------------------------
-<<<<<<< HEAD
-class FdGetLine
-{
-public:
-	FdGetLine(int fd);
-	~FdGetLine();
-=======
 class FdGetLine : public GetLine
 {
 public:
 	FdGetLine(int fd);
 	virtual ~FdGetLine();
->>>>>>> 0.12
 private:
 	FdGetLine(const FdGetLine &rToCopy);
 
 public:
-<<<<<<< HEAD
-	std::string GetLine(bool Preprocess = false);
-	bool IsEOF() {return mEOF;}
-	int GetLineNumber() {return mLineNumber;}
-	
-	// Call to detach, setting file pointer correctly to last bit read.
-	// Only works for lseek-able file descriptors.
-	void DetachFile();
-	
-private:
-	char mBuffer[FDGETLINE_BUFFER_SIZE];
-	int mFileHandle;
-	int mLineNumber;
-	int mBufferBegin;
-	int mBytesInBuffer;
-	bool mPendingEOF;
-	bool mEOF;
-=======
 	virtual std::string GetLine(bool Preprocess = false);
 	// Call to detach, setting file pointer correctly to last bit read.
 	// Only works for lseek-able file descriptors.
@@ -86,7 +44,6 @@ protected:
 
 private:
 	int mFileHandle;
->>>>>>> 0.12
 };
 
 #endif // FDGETLINE__H