fix merge errors

vkovec · vkovec · commit a16bbccde78f · 2017-09-19T12:49:01.000-04:00
diff --git a/Assets/FbxExporters/Editor/InstallIntegration.cs b/Assets/FbxExporters/Editor/InstallIntegration.cs
@@ -36,7 +36,7 @@ public static string INTEGRATION_FOLDER_PATH
             }
         }
 
-        private const string MODULE_TEMPLATE_PATH = "FbxExporters/Integrations/Autodesk/maya/" + MODULE_FILENAME + ".txt";
+        public const string MODULE_TEMPLATE_PATH = "FbxExporters/Integrations/Autodesk/maya/" + MODULE_FILENAME + ".txt";
 
 #if UNITY_EDITOR_OSX
         private const string MAYA_MODULES_PATH = "Library/Preferences/Autodesk/Maya/modules";
@@ -399,6 +399,7 @@ public static void InstallMayaIntegration ()
             var mayaExe = GetMayaExe ();
             if (string.IsNullOrEmpty (mayaExe)) {
                 return;
+            }
 
             // decompress zip file if it exists, otherwise try using default location
             if (System.IO.File.Exists (GetIntegrationZipFullPath())) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static string INTEGRATION_FOLDER_PATH`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- private const string MODULE_TEMPLATE_PATH = "FbxExporters/Integrations/Autodesk/maya/" + MODULE_FILENAME + ".txt";`
	`39`	`+ public const string MODULE_TEMPLATE_PATH = "FbxExporters/Integrations/Autodesk/maya/" + MODULE_FILENAME + ".txt";`
`40`	`40`
`41`	`41`	`#if UNITY_EDITOR_OSX`
`42`	`42`	`private const string MAYA_MODULES_PATH = "Library/Preferences/Autodesk/Maya/modules";`
`@@ -399,6 +399,7 @@ public static void InstallMayaIntegration ()`
`399`	`399`	`var mayaExe = GetMayaExe ();`
`400`	`400`	`if (string.IsNullOrEmpty (mayaExe)) {`
`401`	`401`	`return;`
	`402`	`+ }`
`402`	`403`
`403`	`404`	`// decompress zip file if it exists, otherwise try using default location`
`404`	`405`	`if (System.IO.File.Exists (GetIntegrationZipFullPath())) {`