MC-20116: DOCS release notes

Fixed markdown lists to pass linting rules

Author: bdenham

docs/release-notes.md

@@ -4,55 +4,73 @@ The following updates describe the latest improvements to Page Builder.
 
 The release notes include:
 
-- {:.new}New features
-- {:.fix}Fixes and improvements
+-   {:.new}New features
+-   {:.fix}Fixes and improvements
 
 ## 1.1.0
 
 This release is compatible Magento Commerce 2.3.3+.
 
-- {:.new}<!-- MC-15250 -->Added explicit product sorting to the Products content type.
+-   {:.new}<!-- MC-15250 -->Added explicit product sorting to the Products content type.
 
-- {:.new}<!-- MC-17823 -->Added buttons for inserting images, widgets, and variables in the HTML content type.
+-   {:.new}<!-- MC-17823 -->Added buttons for inserting images, widgets, and variables in the HTML content type.
 
+<<<<<<< Updated upstream
 - {:.fix}Improved Page Builder security.
 
 - {:.fix}<!-- MC-1805 -->Updated Page Builder to support PHP version 7.3.
 
 - {:.fix}<!-- MC-4137 -->Updated TinyMCE to version 4.9.5. This update, along with our additional improvements, fixed several TinyMCE inline editor issues:
-
-  - {:.fix}Variables, images, & image links now get added where the cursor is place.
-  - {:.fix}Tables and table cells can now be center aligned.
-  - {:.fix}Copy/paste now pastes content at the cursor's position.
-  - {:.fix}Links can now be applied to selected text.
-  - {:.fix}Bullets are now properly aligned.
-  - {:.fix}Changes within the inline editor can now be saved without first clicking outside the editor.
-
+=======
+-   {:.fix}<!-- MC-4137 -->Updated TinyMCE to version 4.9.5. This update fixed several TinyMCE inline editor issues:
+>>>>>>> Stashed changes
+
+  -   {:.fix}Variables, images, & image links now get added where the cursor is place.
+  -   {:.fix}Tables and table cells can now be center aligned.
+  -   {:.fix}Copy/paste now pastes content at the cursor's position.
+  -   {:.fix}Links can now be applied to selected text.
+  -   {:.fix}Bullets are now properly aligned.
+  -   {:.fix}Changes within the inline editor can now be saved without first clicking outside the editor.
+
+<<<<<<< Updated upstream
 - {:.fix}<!-- MC-3880 -->Fixed an issue in which the minimum height & vertical alignment was inconsistent between sections on the edit panel for each content type.
 
 - {:.fix}<!-- MC-14994 -->Fixed an issue in which the toolbar from the Heading content type was positioned incorrectly when first dropped on the stage.
 
 - {:.fix}<!-- MC-15742 -->Fixed hard-coded margins in both Slider and Video content types.
+=======
+-   {:.fix}<!-- MC-1805 -->Updated Page Builder to PHP version 7.3.
+
+-   {:.fix}Security enhancements.
+
+-   {:.fix}<!-- MC-3880 -->Fixed an issue in which the minimum height & vertical alignment was inconsistent between sections On the edit panel for each content type.
+
+-   {:.fix}<!-- MC-14994 -->Fixed an issue in which the toolbar from the Heading content type was positioned incorrectly when first dropped on the stage.
+
+-   {:.fix}<!-- MC-15742 -->Removed the hard-coded 35px from the bottom of the Slider content type.
+>>>>>>> Stashed changes
+
+-   {:.fix}<!-- MC-15812 -->Removed the hard-code 5px from the bottom of the Video content type.
 
-- {:.fix}<!-- MC-16241 -->Fixed an issue in which the required asterisk symbol was displayed twice on form fields.
+-   {:.fix}<!-- MC-16241 -->Fixed an issue in which the required asterisk symbol was displayed twice on form fields.
 
 ## 1.0.2
 
 This release is compatible Magento Commerce 2.3.2.1+.
 
-- {:.new}Security enhancements.
+-   {:.new}Security enhancements.
 
 ## 1.0.1
 
-- {:.new}Ensures compatibility with Magento Commerce 2.3.2.
+-   {:.new}Ensures compatibility with Magento Commerce 2.3.2.
 
 ## 1.0.0
 
-- {:.new}General availability release!
+-   {:.new}General availability release!
 
-### Documentation
+## Documentation
 
 To learn more about Page Builder and Page Builder development:
 
-- For developers: [What is Page Builder?](https://devdocs.magento.com/page-builder/docs/index.html)
-- For end-users: [Page Builder User Guide](https://docs.magento.com/m2/ee/user_guide/cms/page-builder.html)
+-   For developers: [What is Page Builder?](https://devdocs.magento.com/page-builder/docs/index.html)
+-   For end-users: [Page Builder User Guide](https://docs.magento.com/m2/ee/user_guide/cms/page-builder.html)