fixed merge conflicts

Jeanne Frontain · Jeanne Frontain · commit a22c380202d5 · 2017-06-01T23:21:26.000-05:00
diff --git a/guides/v2.1/release-notes/ReleaseNotes2.1.7CE.md b/guides/v2.1/release-notes/ReleaseNotes2.1.7CE.md
@@ -13,10 +13,12 @@ github_link: release-notes/ReleaseNotes2.1.7CE.md
 *	TOC
 {:toc}
 
+
 *Release date: May 31, 2017*
 
 *Page updated: June 1, 2017*
 
+
 We are pleased to present Magento Community Edition 2.1.7. This release includes critical enhancements to the security of your Magento software.
 
 
@@ -44,8 +46,10 @@ Magento 2.1.7 contains over 15 security enhancements as well as one significant
   <tr>
     <th>Currently installed Magento version</th>
     <th>Upgrade to ...</th>
+
         <th>Additional actions</th>
 
+
   </tr>
 
   <tr>
diff --git a/guides/v2.1/release-notes/ReleaseNotes2.1.7EE.md b/guides/v2.1/release-notes/ReleaseNotes2.1.7EE.md
@@ -13,6 +13,7 @@ github_link: release-notes/ReleaseNotes2.1.7EE.md
 *	TOC
 {:toc}
 
+
 *Release date: May 31, 2017*
 
 *Page updated: June 1, 2017*
@@ -42,8 +43,10 @@ Magento 2.1.7 contains over 15 security enhancements as well as one significant
   <tr>
     <th>Currently installed Magento version</th>
     <th>Upgrade to ...</th>
+
         <th>Additional actions</th>
 
+
   </tr>
   <tr>
     <td>2.1.0 - 2.1.5</td>
