Fix conflict

buildconfig/BuildConfig.cpp.in

@@ -33,6 +33,7 @@ Config::Config()
     VERSION_STR = "@MultiMC_VERSION_STRING@";
     NEWS_RSS_URL = "@MultiMC_NEWS_RSS_URL@";
     PASTE_EE_KEY = "@MultiMC_PASTE_EE_API_KEY@";
+    IMGUR_CLIENT_ID = "@MultiMC_IMGUR_CLIENT_ID@";
     META_URL = "@MultiMC_META_URL@";
 
     BUG_TRACKER_URL = "@MultiMC_BUG_TRACKER_URL@";

buildconfig/BuildConfig.h

@@ -31,6 +31,11 @@ public:
     /// URL for the updater's channel
     QString CHANLIST_URL;
 
+    /// User-Agent to use.
+    QString USER_AGENT = "MultiMC/5.0";
+    /// User-Agent to use for uncached requests.
+    QString USER_AGENT_UNCACHED = "MultiMC/5.0 (Uncached)";
+
     /// Google analytics ID
     QString ANALYTICS_ID;
 
@@ -60,6 +65,11 @@ public:
      */
     QString PASTE_EE_KEY;
 
+    /**
+     * Client ID you can get from Imgur when you register an application
+     */
+    QString IMGUR_CLIENT_ID;
+
     /**
      * MultiMC Metadata repository URL prefix
      */