caihao/SXS20240115
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc

Browse Source
This commit is contained in:
DESKTOP-S5Q9G6M\Tao 2024-01-17 17:53:01 +08:00
commit b5eea3213e
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SRC/wsSXS/wsSXS.csproj.user
View File

@ -6,19 +6,12 @@
=======
<<<<<<< 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>