diff options
| author | rmcardle <riley@mremoteng.org> | 2011-12-29 06:02:40 +0400 |
|---|---|---|
| committer | rmcardle <riley@mremoteng.org> | 2011-12-29 06:02:40 +0400 |
| commit | d23fd3fc1fc0bd6eb61015d144d794625c9587a5 (patch) | |
| tree | cda47d71a3ed75bc9b0a5e857b717a3f80dcd96a /mRemoteV1/My Project/Resources.Designer.vb | |
| parent | 82d56f13fcb50253d348ad07056ff5097cc2e77f (diff) | |
Fix merge error.
Diffstat (limited to 'mRemoteV1/My Project/Resources.Designer.vb')
| -rw-r--r-- | mRemoteV1/My Project/Resources.Designer.vb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index 60fb6dd6..cd58a0f8 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -753,9 +753,6 @@ Namespace My.Resources End Get End Property - End Get - End Property - '''<summary> ''' Looks up a localized string similar to The startup connection file could not be loaded.{0}{0}{2}{0}{3}{0}{0}In order to prevent data loss, {1} will now exit.. '''</summary> @@ -771,10 +768,13 @@ Namespace My.Resources Friend ReadOnly Property strUpdateCheckPortableEdition() As String Get Return ResourceManager.GetString("strUpdateCheckPortableEdition", resourceCulture) + End Get + End Property + Friend ReadOnly Property Tab_Icon() As System.Drawing.Icon Get Dim obj As Object = ResourceManager.GetObject("Tab_Icon", resourceCulture) - Return CType(obj,System.Drawing.Icon) + Return CType(obj, System.Drawing.Icon) End Get End Property |