This repo is archived. You can view files and clone it, but cannot push or open issues or pull requests.
SXS20240115/SRC/MESWin/SYS4/21691/My Project/Resources.Designer.vb
fenghongdan dd4e6c82e6 Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
#	SRC/MESWin/ENT/ET_TestData14278/ET_Subcontractor.vbproj.vspscc
#	SRC/MESWin/ENT/ET_TestData14278/My Project/Application.Designer.vb
#	SRC/MESWin/ENT/ET_TestData14278/My Project/Application.myapp
#	SRC/MESWin/ENT/ET_TestData14278/My Project/AssemblyInfo.vb
#	SRC/MESWin/ENT/ET_TestData14278/My Project/BuildIncrementVersionInfo.vb
#	SRC/MESWin/ENT/ET_TestData14278/My Project/Resources.Designer.vb
#	SRC/MESWin/ENT/ET_TestData14278/My Project/Resources.resx
#	SRC/MESWin/ENT/ET_TestData14278/My Project/Settings.Designer.vb
#	SRC/MESWin/ENT/ET_TestData14278/My Project/Settings.settings
#	SRC/MESWin/ENT/ET_TestData14278/My Project/licenses.licx
#	SRC/MESWin/ENT/ET_TestData14278/iMES.snk
#	SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.sln
#	SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.vbproj
#	SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.vbproj.user
#	SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.vbproj.vspscc
#	SRC/MESWin/SYS1/ET_21674/My Project/Application.Designer.vb
#	SRC/MESWin/SYS1/ET_21674/My Project/Application.myapp
#	SRC/MESWin/SYS1/ET_21674/My Project/AssemblyInfo.vb
#	SRC/MESWin/SYS1/ET_21674/My Project/BuildIncrementVersionInfo.vb
#	SRC/MESWin/SYS1/ET_21674/My Project/Resources.Designer.vb
#	SRC/MESWin/SYS1/ET_21674/My Project/Resources.resx
#	SRC/MESWin/SYS1/ET_21674/My Project/Settings.Designer.vb
#	SRC/MESWin/SYS1/ET_21674/My Project/Settings.settings
#	SRC/MESWin/SYS1/ET_21674/My Project/licenses.licx
#	SRC/MESWin/SYS1/ET_21674/frmSubcontractor.resx
#	SRC/MESWin/SYS1/ET_21674/frmSubcontractor.vb
#	SRC/MESWin/SYS1/ET_21674/frmSubcontractorContDef.resx
#	SRC/MESWin/SYS1/ET_21674/frmSubcontractorContDef.vb
#	SRC/MESWin/SYS1/ET_21674/frmSubcontractorDef.resx
#	SRC/MESWin/SYS1/ET_21674/frmSubcontractorDef.vb
#	SRC/MESWin/SYS1/ET_21674/frmTeacherContDef.resx
#	SRC/MESWin/SYS1/ET_21674/frmTeacherContDef.vb
#	SRC/MESWin/SYS1/ET_21674/frmTeacherDef.resx
#	SRC/MESWin/SYS1/ET_21674/frmTeacherDef.vb
#	SRC/MESWin/SYS1/ET_21674/iMES.snk
#	SRC/MESWin/SYS2/SYSENT21687/ET_Subcontractor.sln
#	SRC/MESWin/SYS2/SYSENT21687/ET_Subcontractor.vbproj
#	SRC/MESWin/SYS2/SYSENT21687/frmSubcontractor.resx
#	SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorContDef.resx
#	SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorContDef.vb
#	SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorDef.resx
#	SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorDef.vb
#	SRC/MESWin/SYS4/21691/ET_Subcontractor.sln
#	SRC/MESWin/SYS4/21691/ET_Subcontractor.vbproj
#	SRC/MESWin/SYS4/21691/ET_Subcontractor.vbproj.vspscc
#	SRC/MESWin/SYS4/21691/My Project/Application.Designer.vb
#	SRC/MESWin/SYS4/21691/My Project/Application.myapp
#	SRC/MESWin/SYS4/21691/My Project/AssemblyInfo.vb
#	SRC/MESWin/SYS4/21691/My Project/BuildIncrementVersionInfo.vb
#	SRC/MESWin/SYS4/21691/My Project/Resources.Designer.vb
#	SRC/MESWin/SYS4/21691/My Project/Resources.resx
#	SRC/MESWin/SYS4/21691/My Project/Settings.Designer.vb
#	SRC/MESWin/SYS4/21691/My Project/Settings.settings
#	SRC/MESWin/SYS4/21691/My Project/licenses.licx
#	SRC/MESWin/SYS4/21691/frmSubcontractor.resx
#	SRC/MESWin/SYS4/21691/frmSubcontractor.vb
#	SRC/MESWin/SYS4/21691/frmSubcontractorContDef.resx
#	SRC/MESWin/SYS4/21691/frmSubcontractorContDef.vb
#	SRC/MESWin/SYS4/21691/frmSubcontractorDef.resx
#	SRC/MESWin/SYS4/21691/frmSubcontractorDef.vb
#	SRC/MESWin/SYS4/21691/iMES.snk
#	SRC/MEStc_SXS/tcENT_21674/clsENT_21674.cs
#	SRC/wsSXS/wxENT_21674/wsENT_21674.cs
2024-01-17 17:34:55 +08:00

68 lines
3.0 KiB
VB.net

'------------------------------------------------------------------------------
' <auto-generated>
' 此代码由工具生成。
' 运行时版本:4.0.30319.42000
'
' 对此文件的更改可能会导致不正确的行为,并且如果
' 重新生成代码,这些更改将会丢失。
' </auto-generated>
'------------------------------------------------------------------------------
Option Strict On
Option Explicit On
Imports System
Namespace My.Resources
'此类是由 StronglyTypedResourceBuilder
'类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
'若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
'(以 /str 作为命令选项),或重新生成 VS 项目。
'''<summary>
''' 一个强类型的资源类,用于查找本地化的字符串等。
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
Friend Module Resources
Private resourceMan As Global.System.Resources.ResourceManager
Private resourceCulture As Global.System.Globalization.CultureInfo
'''<summary>
''' 返回此类使用的缓存的 ResourceManager 实例。
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
Get
If Object.ReferenceEquals(resourceMan, Nothing) Then
<<<<<<<< HEAD:SRC/MESWin/SYS4/21691/My Project/Resources.Designer.vb
Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ET_Subcontractor_21691.Resources", GetType(Resources).Assembly)
========
Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ET_Teacher_M.Resources", GetType(Resources).Assembly)
>>>>>>>> dc359766c3664933829094578fcef17205eebc35:SRC/MESWin/SYS1/ET_21674/My Project/Resources.Designer.vb
resourceMan = temp
End If
Return resourceMan
End Get
End Property
'''<summary>
''' 重写当前线程的 CurrentUICulture 属性,对
''' 使用此强类型资源类的所有资源查找执行重写。
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo
Get
Return resourceCulture
End Get
Set
resourceCulture = value
End Set
End Property
End Module
End Namespace