1 files changed, 8 insertions, 0 deletions
diff --git a/lib/backupstore/BackupStoreAccountDatabase.cpp b/lib/backupstore/BackupStoreAccountDatabase.cpp
index 72a813d5..ec44de0e 100644
--- a/lib/backupstore/BackupStoreAccountDatabase.cpp
+++ b/lib/backupstore/BackupStoreAccountDatabase.cpp
@@ -40,7 +40,11 @@ public:
 //		Created: 2003/08/20
 //
 // --------------------------------------------------------------------------
+<<<<<<< HEAD
 BackupStoreAccountDatabase::BackupStoreAccountDatabase(const char *Filename)
+=======
+BackupStoreAccountDatabase::BackupStoreAccountDatabase(const std::string& Filename)
+>>>>>>> 0.12
 	: pImpl(new _BackupStoreAccountDatabase)
 {
 	pImpl->mFilename = Filename;
@@ -123,7 +127,11 @@ BackupStoreAccountDatabase::Entry::~Entry()
 //		Created: 2003/08/21
 //
 // --------------------------------------------------------------------------
+<<<<<<< HEAD
 std::auto_ptr<BackupStoreAccountDatabase> BackupStoreAccountDatabase::Read(const char *Filename)
+=======
+std::auto_ptr<BackupStoreAccountDatabase> BackupStoreAccountDatabase::Read(const std::string& Filename)
+>>>>>>> 0.12
 {
 	// Database object to use
 	std::auto_ptr<BackupStoreAccountDatabase> db(new BackupStoreAccountDatabase(Filename));