From de038acd96ca86f624336f372808d29b9c9f23fd Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Tue, 9 Oct 2012 12:28:00 -0400
Subject: [PATCH] Fix bad merge, pszDataDir duplication

---
 src/init.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index e49165238..bdddc631d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -447,7 +447,6 @@ bool AppInit2()
     FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist.
     if (file) fclose(file);
     static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
-    const char* pszDataDir = GetDataDir().string().c_str();
     if (!lock.try_lock())
         return InitError(strprintf(_("Cannot obtain a lock on data directory %s.  Bitcoin is probably already running."), pszDataDir));