chore: Resolve merge conflicts with release-3.2.1

Author: paulhazen

Assets/Plugins/Source/Core/EOSManager.cs

@@ -73,12 +73,13 @@ namespace PlayEveryWare.EpicOnlineServices
     using LoginCallbackInfo = Epic.OnlineServices.Auth.LoginCallbackInfo;
     using LoginOptions = Epic.OnlineServices.Auth.LoginOptions;
     using LoginStatusChangedCallbackInfo = Epic.OnlineServices.Auth.LoginStatusChangedCallbackInfo;
-#endif
+
     using Utility;
     using JsonUtility = PlayEveryWare.EpicOnlineServices.Utility.JsonUtility;
     using LogoutCallbackInfo = Epic.OnlineServices.Auth.LogoutCallbackInfo;
     using LogoutOptions = Epic.OnlineServices.Auth.LogoutOptions;
     using OnLogoutCallback = Epic.OnlineServices.Auth.OnLogoutCallback;
+#endif
 
     /// <summary>
     /// One of the responsibilities of this class is to manage the lifetime of

CHANGELOG.md

@@ -2,6 +2,13 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [3.2.1] - 2024-06-24
+
+- ### Fixes
+- **Release Binary Fixes**:
+  - Corrects an error that was made when generating the binary package for the `3.2.0` release.
+  - Corrects an issue where the presence of the scripting define `EOS_DISABLE` caused compilation errors.
+
 # [3.2.0] - 2024-05-16
 
 ### New Features

etc/PackageTemplate/CHANGELOG.md

@@ -2,11 +2,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-# [3.2.1] - 2024-06-20
+# [3.2.1] - 2024-06-24
 
-### Fixes
-- **General Fixes**:
-  - Corrected the binary associated with the release, and included the appropriate `.gitattributes` file for the corresponding release in the `eos_plugin_for_unity_upm` repository.
+- ### Fixes
+- **Release Binary Fixes**:
+  - Corrects an error that was made when generating the binary package for the `3.2.0` release.
+  - Corrects an issue where the presence of the scripting define `EOS_DISABLE` caused compilation errors.
 
 # [3.2.0] - 2024-05-16
 

etc/PackageTemplate/package.json

@@ -31,6 +31,6 @@
         }
     ],
     "com_playeveryware": {
-        "git_build_sha": "337a768c64ddfb73294c904923b2db8a45308ef5"
+        "git_build_sha": "ca1af13f274ed796f9d575e7e88151ad8dc2a5f0"
     }
 }