Update CHANGELOG

alphagov · Sep 3, 2019 · e3c7ad7 · e3c7ad7
1 parent 058c712
commit e3c7ad7
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,11 +12,9 @@
 * Restore margin bottom to the image card (PR #1079)
 * Allow summary_list to render without borders (PR #1073)
 * Remove govuk_frontend_toolkit sass dependencies (PR #1069)
-<<<<<<< HEAD
 * Explicitly set focus states (PR #1071)
-=======
 * Override edit link text on summary-link component (#1076)
->>>>>>> 8cbdd3ef... Update CHANGELOG
+* Allow inset-text to take a block (PR #1078)
 
 ## 18.3.1