correct faulty merges

This commit is contained in:
olivia hugger 2018-11-07 15:46:03 +01:00 committed by GitHub
parent afd0a6ff69
commit 9a66a1614e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions

View File

@ -1,10 +1,5 @@
## HEAD ## HEAD
* Textile is only supported through a converter plugin (#7003)
* Add info how to deploy using pre-push git hook (#7179)
* chore(release): reflect latest patched releases (#7262)
* Update posts.md (#7360)
### Documentation ### Documentation
* Release post for v3.8.0 (#6849) * Release post for v3.8.0 (#6849)
@ -75,6 +70,9 @@
* Document Jekyll Filters with YAML data (#7335) * Document Jekyll Filters with YAML data (#7335)
* Remove redundant instruction comment (#7342) * Remove redundant instruction comment (#7342)
* docs: minimize rendering count (#7343) * docs: minimize rendering count (#7343)
* Update posts.md (#7360)
* Add info how to deploy using pre-push git hook (#7179)
* Textile is only supported through a converter plugin (#7003)
### Minor Enhancements ### Minor Enhancements