Post merge fixes

2019-11-13 12:53:01 +01:00
parent 6dceb9c449
commit 0be396c4fd
23 changed files with 38 additions and 56 deletions
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -115,7 +115,7 @@ namespace Umbraco.Core.IO
        }

        //use a tilde character instead of the complete path
-        public string ReturnPath(string settingsKey, string standardPath, bool useTilde)
+        private string ReturnPath(string settingsKey, string standardPath, bool useTilde)
        {
            var retval = ConfigurationManager.AppSettings[settingsKey];

@@ -125,7 +125,7 @@ namespace Umbraco.Core.IO
            return retval.TrimEnd('/');
        }

-        public string ReturnPath(string settingsKey, string standardPath)
+        private string ReturnPath(string settingsKey, string standardPath)
        {
            return ReturnPath(settingsKey, standardPath, false);