# Conflicts: # SRC/MESWin/ENT/ET_Subcontractor/My Project/BuildIncrementVersionInfo.vb # SRC/MEStc_SXS/tcENT/clsENT.cs |
||
|---|---|---|
| .. | ||
| Application.Designer.vb | ||
| Application.myapp | ||
| AssemblyInfo.vb | ||
| BuildIncrementVersionInfo.vb | ||
| licenses.licx | ||
| Resources.Designer.vb | ||
| Resources.resx | ||
| Settings.Designer.vb | ||
| Settings.settings | ||