From e3c7ad73a0ca01c4985d1db96a44310210bb1ee6 Mon Sep 17 00:00:00 2001
From: ChrisBAshton <christopher.ashton@digital.cabinet-office.gov.uk>
Date: Fri, 30 Aug 2019 15:45:58 +0100
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a66321f4b..73c6ebfb24 100644
--- 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