diff options
| author | william341 <[email protected]> | 2016-07-25 12:23:44 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2016-07-25 12:23:44 -0700 |
| commit | 6b83f071c4208ae4104f5659a848af08d7a75705 (patch) | |
| tree | 180d34fa07f753d89925fb67245329b05f4915c5 /source/WindowsFormsApplication1/obj | |
| parent | 5e4ac239005aeba9d190a3c6d428917dd94de607 (diff) | |
| parent | abe52183e0e34051196d72ac0e56733bd0749bdd (diff) | |
| download | shiftos-c--6b83f071c4208ae4104f5659a848af08d7a75705.tar.gz shiftos-c--6b83f071c4208ae4104f5659a848af08d7a75705.tar.bz2 shiftos-c--6b83f071c4208ae4104f5659a848af08d7a75705.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe
# source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb
# source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources
# source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt
# source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache
# source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache
# source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe
# source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb
Diffstat (limited to 'source/WindowsFormsApplication1/obj')
| -rw-r--r-- | source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt index 39f7162..97a3d5e 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt @@ -235,4 +235,8 @@ C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Sv C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Svg.xml C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Interop.WMPLib.dll C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\AxInterop.WMPLib.dll +<<<<<<< HEAD C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\WindowsFormsApplication1\obj\Debug\ShiftOS.Apps.About.resources +======= +C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\obj\Debug\ShiftOS.Apps.About.resources +>>>>>>> origin/master |