ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDVD: fix conflicts merging

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-09-19 12:40:08 +02:00 committed by Kojin
parent ad1cdc9122
commit ee53bd795b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PCSX2_suite.sln
View File

@ -612,10 +612,6 @@ Global
{12728250-16EC-4DC6-94D7-E21DD88947F8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
<<<<<<< HEAD
SolutionGuid = {0BC474EA-3628-45D3-9DBC-E22D0B7E0F77}
=======
SolutionGuid = {E0DF661E-BE9A-4467-A034-16AA535A1CB5}
>>>>>>> CDVD: merging and removing remnants of plugin
EndGlobalSection
EndGlobal