From c16ab0a19fa388afc2f8b31cd8ca6e653c231a1c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 29 Sep 2014 15:27:45 -0700
Subject: [PATCH] remove definition for an unused method

---
 libraries/shared/src/HifiConfigVariantMap.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/shared/src/HifiConfigVariantMap.h b/libraries/shared/src/HifiConfigVariantMap.h
index 99a58d731e..6bdeb15589 100644
--- a/libraries/shared/src/HifiConfigVariantMap.h
+++ b/libraries/shared/src/HifiConfigVariantMap.h
@@ -33,7 +33,6 @@ private:
     QVariantMap _userConfig;
     QVariantMap _mergedConfig;
     
-    QVariantMap mergeMasterConfigWithUserConfig(const QStringList& argumentList);
     void loadMapFromJSONFile(QVariantMap& existingMap, const QString& filename);
     void addMissingValuesToExistingMap(QVariantMap& existingMap, const QVariantMap& newMap);
 };