doomtrain/nextesttracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean Up

Browse Source 
Removed conflict files
This commit is contained in:
doomtrain
2016-07-12 21:27:35 +08:00
parent a613b8e9f0
commit 457fec8a9d
41 changed files with 37 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files
systemservice/bin/Debug/systemservice.exe
BIN
View File
Binary file not shown.
systemservice/bin/Debug/systemservice.pdb
BIN
View File
Binary file not shown.
systemservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput (1).cache
BIN
View File
Binary file not shown.
systemservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice (1).exe
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice (1).pdb
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice.exe
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice.pdb
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice.vbproj.FileListAbsolute (1).txt
-20
View File
@@ -1,20 +0,0 @@
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe.config
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.pdb
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.xml
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.frm_system_svc.resources
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.Resources.resources
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.vbproj.GenerateResource.Cache
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.exe
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.xml
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.pdb
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe.config
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.pdb
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.xml
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.frm_system_svc.resources
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.Resources.resources
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.vbproj.GenerateResource.Cache
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.exe
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.xml
C:\Users\yebreo1\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.pdb
systemservice/obj/Debug/systemservice.vbproj.FileListAbsolute.txt
+10
View File
@@ -18,3 +18,13 @@ D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.exe
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.xml
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.pdb
D:\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.exe.config
D:\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.exe
D:\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.pdb
D:\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.xml
D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.frm_system_svc.resources
D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.Resources.resources
D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.vbproj.GenerateResource.Cache
D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.exe
D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.xml
D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.pdb
systemservice/obj/Debug/systemservice.vbproj.FileListAbsolute[Conflict].txt
-20
View File
@@ -1,20 +0,0 @@
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe.config
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.pdb
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.xml
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.frm_system_svc.resources
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.Resources.resources
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.vbproj.GenerateResource.Cache
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.exe
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.xml
C:\Users\yebreo\Google Drive\Visual Studio .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.pdb
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe.config
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.exe
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.pdb
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\bin\Debug\systemservice.xml
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.frm_system_svc.resources
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.Resources.resources
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.vbproj.GenerateResource.Cache
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.exe
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.xml
D:\Google Drive\Development\Visual Basic .NET\NextestUITracker.NET\nxtuitracker\systemservice\obj\Debug\systemservice.pdb
systemservice/obj/Debug/systemservice.vbproj.GenerateResource (1).Cache
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice.vbproj.GenerateResource[Conflict].Cache
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice[Conflict].exe
BIN
View File
Binary file not shown.
systemservice/obj/Debug/systemservice[Conflict].pdb
BIN
View File
Binary file not shown.