Skip to content

Commit

Permalink
fix some of my merge fix boo boos
Browse files Browse the repository at this point in the history
  • Loading branch information
kmscode committed Sep 5, 2017
1 parent 726e908 commit 07eb45a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mRemoteV1/Resources/Language/Language.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions mRemoteV1/Resources/Language/Language.resx
Expand Up @@ -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>
1 change: 0 additions & 1 deletion mRemoteV1/UI/Window/BaseWindow.cs
Expand Up @@ -38,7 +38,6 @@ public void SetFormText(string t)
}
#endregion

#region Private Methods
public new void ApplyTheme()
{

Expand Down

0 comments on commit 07eb45a

Please sign in to comment.