From 934e172113e196e11827c8d93b18b1dbb3938bf9 Mon Sep 17 00:00:00 2001
From: Benxidosz <benxidosz@sch.bme.hu>
Date: Fri, 13 Aug 2021 21:26:45 +0200
Subject: [PATCH] merge fix
---
.../Editor/Resources/PlayFabEditorPrefsSO.asset | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/PlayFabEditorExtensions/Editor/Resources/PlayFabEditorPrefsSO.asset b/Assets/PlayFabEditorExtensions/Editor/Resources/PlayFabEditorPrefsSO.asset
index 7f0195c..5fcfed7 100644
--- a/Assets/PlayFabEditorExtensions/Editor/Resources/PlayFabEditorPrefsSO.asset
+++ b/Assets/PlayFabEditorExtensions/Editor/Resources/PlayFabEditorPrefsSO.asset
@@ -9,13 +9,13 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5d0199c11aa6f514784c5c69cd8378d8, type: 3}
+ m_Script: {fileID: 0}
m_Name: PlayFabEditorPrefsSO
- m_EditorClassIdentifier:
- DevAccountEmail: vikszpedison@gmail.com
- DevAccountToken: q7ekk6qs4parygj9kn1jxxjkbj3rn436qpjkfdr8y6g65mippinkemort165obzrw6j5y6rj7exqmgrk4e1dhgf7ia67jxrr6ogy74osxuggf5zsh41ig49t8nsnwfxsuhkckym8439s3u9tji9mdxotiyaxm365cogc65piacyj6poebw9z3szsy9kdzzk877bzimne
- SelectedStudio: My Game Studio
- SdkPath: Assets/PlayFabSDK
+ m_EditorClassIdentifier: PlayFabEditorExtensions:PlayFab.PfEditor:PlayFabEditorPrefsSO
+ DevAccountEmail:
+ DevAccountToken:
+ SelectedStudio:
+ SdkPath:
EdExPath:
LocalCloudScriptPath:
PanelIsShown: 0
--
GitLab