| | |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Common.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Common.pdb |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\log4net.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\bin\Release\Oracle.DataAccess.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csprojAssemblyReference.cache |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.csproj.CopyComplete |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_CODE\web\Common\obj\Release\Common.pdb |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.pdb |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\log4net.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\bin\Release\Oracle.DataAccess.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csprojAssemblyReference.cache |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CopyComplete |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.dll |
|---|
| | | C:\Users\Administrator\Desktop\Archives\Git\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.pdb |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Common.pdb |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\log4net.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\bin\Release\Oracle.DataAccess.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.AssemblyReference.cache |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.csproj.CopyComplete |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\obj\Release\Common.pdb |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\bin\Release\Common.dll |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\bin\Release\Common.pdb |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\bin\Release\log4net.dll |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CopyComplete |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.dll |
|---|
| | | D:\Company\SMGW_NewWeb\web\Common\obj\Release\Common.pdb |
|---|
| | | <<<<<<< Updated upstream |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Common.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Common.pdb |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\log4net.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\bin\Release\Oracle.DataAccess.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.AssemblyReference.cache |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CoreCompileInputs.cache |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.csproj.CopyComplete |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.dll |
|---|
| | | C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\obj\Release\Common.pdb |
|---|
| | | ======= |
|---|
| | | >>>>>>> Stashed changes |
|---|
