33113c6fa3
# Conflicts: # SRC/MESWin/ENT/ET_Subcontractor/ET_Subcontractor.vbproj # SRC/MESWin/ENT/ET_Subcontractor/My Project/Resources.Designer.vb # SRC/MESWin/ENT/ET_Subcontractor/My Project/Settings.Designer.vb # SRC/MESWin/ENT/ET_Subcontractor/frmSubcontractorContDef.vb # SRC/MESWin/ENT/ET_Subcontractor/frmSubcontractorDef.vb # SRC/MEStc_SXS/tcENT/clsENT.cs # SRC/wsSXS/wsSXS.csproj.user # SRC/wsSXS/wxENT/wsENT.cs
14 lines
619 B
XML
14 lines
619 B
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<PropertyGroup>
|
|
<<<<<<< HEAD
|
|
<ReferencePath>E:\code\SRC\MES_S_DLL\</ReferencePath>
|
|
=======
|
|
<<<<<<< HEAD
|
|
<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
|
|
>>>>>>> 7a91e232e75dd451f6bd1a92477e646c49dca747
|
|
</PropertyGroup>
|
|
</Project> |