diff options
Diffstat (limited to 'source/WindowsFormsApplication1/obj/Debug')
| -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 |