clear merging conflict
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -1,2 +1,2 @@
|
||||
PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.44.35207:TargetPlatformVersion=10.0.26100.0:
|
||||
PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.44.35207:TargetPlatformVersion=10.0.22621.0:
|
||||
Debug|x64|D:\platform-dev\|
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user