Fix conflict

launcher/minecraft/auth/AuthSession.cpp

@@ -8,11 +8,13 @@
 QString AuthSession::serializeUserProperties()
 {
     QJsonObject userAttrs;
+    /*
     for (auto key : u.properties.keys())
     {
         auto array = QJsonArray::fromStringList(u.properties.values(key));
         userAttrs.insert(key, array);
     }
+    */
     QJsonDocument value(userAttrs);
     return value.toJson(QJsonDocument::Compact);