fixing merge conflict

This commit is contained in:
Brian Lich
2017-04-24 11:41:24 -07:00
2 changed files with 2 additions and 1 deletions

View File

@ -18,6 +18,7 @@
"breadcrumb_path": "/internet-explorer/breadcrumb/toc.json",
"ROBOTS": "INDEX, FOLLOW",
"ms.author": "lizross",
"author": "lizross",
"ms.technology": "internet-explorer",
"ms.topic": "article"
},