This repo is archived. You can view files and clone it, but cannot push or open issues or pull requests.
SXS20240115/SRC/MESWin/SXS1/BR_L_CI_GEN_21684/My Project
ISHAO 89b3d8dfe6 Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
#	SRC/MESWin/SYS6/21695韦海桑/backend/wsSXS/wsSXS.csproj.user
#	SRC/MEStc_SXS/MEStc_SXS.csproj
#	SRC/wsSXS/wsSXS.csproj
2024-01-19 17:58:21 +08:00
..
Application.Designer.vb Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
Application.myapp Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
AssemblyInfo.vb Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
BuildIncrementVersionInfo.vb Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
licenses.licx Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
Resources.Designer.vb Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
Resources.resx Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
Settings.Designer.vb Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00
Settings.settings Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-19 17:58:21 +08:00