fix: merge conflicts

immutable · Oct 2, 2024 · 10bcf65 · 10bcf65
2 parents 357d2d1 + 77b4b73
commit 10bcf65
Show file tree

Hide file tree

Showing 73 changed files with 5,684 additions and 2,728 deletions.
diff --git a/.../Core/Xsolla/Browser/XsollaBrowser/Examples/2D/SinglePageBrowser2D/SinglePageBrowser2D.cs b/.../Core/Xsolla/Browser/XsollaBrowser/Examples/2D/SinglePageBrowser2D/SinglePageBrowser2D.cs
@@ -150,23 +150,10 @@ private string GetBrowserPlatform()
 #endif
         }
 
-        private string GetBrowserPath()
-        {
-#if UNITY_EDITOR
-            return Application.persistentDataPath;
-#else
-			if (XsollaSettings.PackInAppBrowserInBuild)
-			{
-				var path = Application.dataPath;
-				path = System.IO.Directory.GetParent(path).FullName;
-				return System.IO.Path.Combine(path, ".local-chromium");
-			}
-			else
-			{
-				return Application.persistentDataPath;
-			}
-#endif
-        }
+		private string GetBrowserPath()
+		{
+			return Application.persistentDataPath;
+		}
 
         private void DestroyPreloader()
         {