dd4e6c82e6
# 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
24 lines
864 B
XML
24 lines
864 B
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<PropertyGroup>
|
|
<<<<<<< HEAD
|
|
<ReferencePath>D:\Program Files\work\GitProject\SRC\MES_S_DLL\</ReferencePath>
|
|
=======
|
|
<<<<<<< HEAD
|
|
<ReferencePath>E:\code\SRC\MES_S_DLL\</ReferencePath>
|
|
<<<<<<< HEAD
|
|
=======
|
|
<<<<<<< HEAD
|
|
=======
|
|
>>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
|
|
<ReferencePath>E:\code\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MES_S_DLL\;E:\Project\digihua\iMES\SYS20240115\SRC\MEStc_SXS\</ReferencePath>
|
|
=======
|
|
<ReferencePath>E:\VisualStudio_app\Digihua\iMES\MES_S_DLL\</ReferencePath>
|
|
>>>>>>> 42de248d2d2ff29266f47df9261e045a7a3351b6
|
|
<<<<<<< HEAD
|
|
>>>>>>> 7a91e232e75dd451f6bd1a92477e646c49dca747
|
|
=======
|
|
|
|
>>>>>>> 4457514143578b10651b4b78f93b8bc6778f4a61
|
|
</PropertyGroup>
|
|
</Project> |