File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change 6231
6231
"redirect_document_id" : false
6232
6232
},
6233
6233
{
6234
- <<<<<<< HEAD
6235
6234
"source_path" : " docs/windows/implements-cancastto-method.md" ,
6236
6235
"redirect_url" : " /cpp/windows/implements-structure#cancastto" ,
6237
6236
"redirect_document_id" : false
6249
6248
{
6250
6249
"source_path" : " docs/windows/implements-iidcount-constant.md" ,
6251
6250
"redirect_url" : " /cpp/windows/implements-structure#iidcount" ,
6252
- =======
6251
+ "redirect_document_id" : false
6252
+ },
6253
+ {
6253
6254
"source_path" : " docs/windows/runtimeclass-tilde-runtimeclass-destructor.md" ,
6254
6255
"redirect_url" : " /cpp/windows/runtimeclass-class#tilde-runtimeclass" ,
6255
6256
"redirect_document_id" : false
6302
6303
{
6303
6304
"source_path" : " docs/windows/runtimeclass-runtimeclass-constructor.md" ,
6304
6305
"redirect_url" : " /cpp/windows/runtimeclass-class#runtimeclass" ,
6305
- >>>>>>> 0f6d99794262d969e0fbf7ddd27ef38565b93b6a
6306
6306
"redirect_document_id" : false
6307
6307
},
6308
6308
{
You can’t perform that action at this time.
0 commit comments