From cc5bd81217577d7a5b0858cb97e23cd10abf9bdb Mon Sep 17 00:00:00 2001 From: Justin Ayala Date: Fri, 12 Apr 2019 13:08:49 -0700 Subject: [PATCH] Added develop branch and ensured the editor setting where correct. --- Packages/manifest.json | 4 ++++ ProjectSettings/EditorSettings.asset | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Packages/manifest.json diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..526aca6 --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,4 @@ +{ + "dependencies": { + } +} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index d0c3d4a..1907ba5 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -4,7 +4,7 @@ EditorSettings: m_ObjectHideFlags: 0 serializedVersion: 7 - m_ExternalVersionControlSupport: Hidden Meta Files + m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 m_LineEndingsForNewScripts: 1 m_DefaultBehaviorMode: 0