Skip to content

Commit 39bcc90

Browse files
committed
MC-20116: DOCS release notes
Fixed markdown lists to pass linting rules
1 parent ad18d00 commit 39bcc90

File tree

1 file changed

+7
-25
lines changed

1 file changed

+7
-25
lines changed

docs/release-notes.md

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ This release is compatible Magento Commerce 2.3.3+.
1515

1616
- {:.new}<!-- MC-17823 -->Added buttons for inserting images, widgets, and variables in the HTML content type.
1717

18-
<<<<<<< Updated upstream
19-
- {:.fix}Improved Page Builder security.
18+
- {:.fix}Improved Page Builder security.
2019

21-
- {:.fix}<!-- MC-1805 -->Updated Page Builder to support PHP version 7.3.
20+
- {:.fix}<!-- MC-1805 -->Updated Page Builder to support PHP version 7.3.
2221

23-
- {:.fix}<!-- MC-4137 -->Updated TinyMCE to version 4.9.5. This update, along with our additional improvements, fixed several TinyMCE inline editor issues:
24-
=======
25-
- {:.fix}<!-- MC-4137 -->Updated TinyMCE to version 4.9.5. This update fixed several TinyMCE inline editor issues:
26-
>>>>>>> Stashed changes
22+
- {:.fix}<!-- MC-4137 -->Updated TinyMCE to version 4.9.5. This update, along with our additional improvements, fixed several TinyMCE inline editor issues:
2723

2824
- {:.fix}Variables, images, & image links now get added where the cursor is place.
2925
- {:.fix}Tables and table cells can now be center aligned.
@@ -32,27 +28,13 @@ This release is compatible Magento Commerce 2.3.3+.
3228
- {:.fix}Bullets are now properly aligned.
3329
- {:.fix}Changes within the inline editor can now be saved without first clicking outside the editor.
3430

35-
<<<<<<< Updated upstream
36-
- {:.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.
37-
38-
- {:.fix}<!-- MC-14994 -->Fixed an issue in which the toolbar from the Heading content type was positioned incorrectly when first dropped on the stage.
39-
40-
- {:.fix}<!-- MC-15742 -->Fixed hard-coded margins in both Slider and Video content types.
41-
=======
42-
- {:.fix}<!-- MC-1805 -->Updated Page Builder to PHP version 7.3.
43-
44-
- {:.fix}Security enhancements.
45-
46-
- {:.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.
31+
- {:.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.
4732

4833
- {:.fix}<!-- MC-14994 -->Fixed an issue in which the toolbar from the Heading content type was positioned incorrectly when first dropped on the stage.
4934

50-
- {:.fix}<!-- MC-15742 -->Removed the hard-coded 35px from the bottom of the Slider content type.
51-
>>>>>>> Stashed changes
52-
53-
- {:.fix}<!-- MC-15812 -->Removed the hard-code 5px from the bottom of the Video content type.
35+
- {:.fix}<!-- MC-15742 -->Fixed hard-coded margins in both Slider and Video content types.
5436

55-
- {:.fix}<!-- MC-16241 -->Fixed an issue in which the required asterisk symbol was displayed twice on form fields.
37+
- {:.fix}<!-- MC-16241 -->Fixed an issue in which the required asterisk symbol was displayed twice on form fields.
5638

5739
## 1.0.2
5840

@@ -68,7 +50,7 @@ This release is compatible Magento Commerce 2.3.2.1+.
6850

6951
- {:.new}General availability release!
7052

71-
## Documentation
53+
### Documentation
7254

7355
To learn more about Page Builder and Page Builder development:
7456

0 commit comments

Comments
 (0)