1 files changed, 8 insertions, 0 deletions
diff --git a/lib/backupstore/BackupStoreAccountDatabase.h b/lib/backupstore/BackupStoreAccountDatabase.h
index 79573242..cb19b01b 100644
--- a/lib/backupstore/BackupStoreAccountDatabase.h
+++ b/lib/backupstore/BackupStoreAccountDatabase.h
@@ -31,11 +31,19 @@ public:
 	friend class _BackupStoreAccountDatabase;	// to stop compiler warnings
 	~BackupStoreAccountDatabase();
 private:
+<<<<<<< HEAD
 	BackupStoreAccountDatabase(const char *Filename);
 	BackupStoreAccountDatabase(const BackupStoreAccountDatabase &);
 public:
 
 	static std::auto_ptr<BackupStoreAccountDatabase> Read(const char *Filename);
+=======
+	BackupStoreAccountDatabase(const std::string& Filename);
+	BackupStoreAccountDatabase(const BackupStoreAccountDatabase &);
+public:
+
+	static std::auto_ptr<BackupStoreAccountDatabase> Read(const std::string& Filename);
+>>>>>>> 0.12
 	void Write();
 
 	class Entry