From e0c122119afea4c951c0c57144d26a473118c254 Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Wed, 14 Jun 2017 19:53:34 -0400
Subject: Fixup botched merge

---
 lib/raidfile/RaidFileController.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lib/raidfile/RaidFileController.h')

diff --git a/lib/raidfile/RaidFileController.h b/lib/raidfile/RaidFileController.h
index b2b8cb0d..601cca22 100644
--- a/lib/raidfile/RaidFileController.h
+++ b/lib/raidfile/RaidFileController.h
@@ -49,11 +49,7 @@ public:
 	int GetSetID() const {return mSetID;}
 	
 	int GetSetNumForWriteFiles(const std::string &rFilename) const;
-<<<<<<< HEAD
-	
-=======
 	int GetSetNumForWriteFiles(const char* filename) const;
->>>>>>> 0.12
 	unsigned int GetBlockSize() const {return mBlockSize;}
 
 	// Is this disc set a non-RAID disc set? (ie files never get transformed to raid storage)
-- 
cgit v1.2.3