Skip to content

Commit 84ab060

Browse files
Fixed a problem in the redirection file caused by resolving a merge conflict.
1 parent ca617f6 commit 84ab060

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.openpublishing.redirection.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6231,7 +6231,6 @@
62316231
"redirect_document_id": false
62326232
},
62336233
{
6234-
<<<<<<< HEAD
62356234
"source_path": "docs/windows/implements-cancastto-method.md",
62366235
"redirect_url": "/cpp/windows/implements-structure#cancastto",
62376236
"redirect_document_id": false
@@ -6249,7 +6248,9 @@
62496248
{
62506249
"source_path": "docs/windows/implements-iidcount-constant.md",
62516250
"redirect_url": "/cpp/windows/implements-structure#iidcount",
6252-
=======
6251+
"redirect_document_id": false
6252+
},
6253+
{
62536254
"source_path": "docs/windows/runtimeclass-tilde-runtimeclass-destructor.md",
62546255
"redirect_url": "/cpp/windows/runtimeclass-class#tilde-runtimeclass",
62556256
"redirect_document_id": false
@@ -6302,7 +6303,6 @@
63026303
{
63036304
"source_path": "docs/windows/runtimeclass-runtimeclass-constructor.md",
63046305
"redirect_url": "/cpp/windows/runtimeclass-class#runtimeclass",
6305-
>>>>>>> 0f6d99794262d969e0fbf7ddd27ef38565b93b6a
63066306
"redirect_document_id": false
63076307
},
63086308
{

0 commit comments

Comments
 (0)