# Conflicts: # SRC/MESWin/ENT/ET_Subcontractor/My Project/BuildIncrementVersionInfo.vb # SRC/MEStc_SXS/tcENT/clsENT.cs |
||
|---|---|---|
| .. | ||
| ET_Demo | ||
| ET_Subcontractor | ||
| ET_TestData14278 | ||
| ET_TestDataBasis_21703 | ||
# Conflicts: # SRC/MESWin/ENT/ET_Subcontractor/My Project/BuildIncrementVersionInfo.vb # SRC/MEStc_SXS/tcENT/clsENT.cs |
||
|---|---|---|
| .. | ||
| ET_Demo | ||
| ET_Subcontractor | ||
| ET_TestData14278 | ||
| ET_TestDataBasis_21703 | ||