fix some of my merge fix boo boos

This commit is contained in:
Sean Kaim
2017-09-05 11:45:58 -04:00
parent 726e908b5a
commit 07eb45ad76
3 changed files with 2 additions and 2 deletions

View File

@@ -19,7 +19,7 @@ namespace mRemoteNG {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Language {

View File

@@ -2591,4 +2591,5 @@ This page will walk you through the process of upgrading your connections file o
</data>
<data name="strOptionsThemeErrorNoThemes" xml:space="preserve">
<value>No themes are loaded, check that the default mremoteNG themes exist in the slash themes folder</value>
</data>
</root>

View File

@@ -38,7 +38,6 @@ namespace mRemoteNG.UI.Window
}
#endregion
#region Private Methods
public new void ApplyTheme()
{