From 72818ab2a8946010649c77b675efc258995c3ac2 Mon Sep 17 00:00:00 2001
From: Caroline Horn <549577+cchaos@users.noreply.github.com>
Date: Wed, 30 Sep 2020 10:14:05 -0400
Subject: [PATCH] Creating a conflict to merge upstream

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8063b3b3e4f..744bd5ffcba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ No public interface changes since `29.2.0`.
 **Theme: Amsterdam**
 
 - Removed `border-radius` from `EuiCallout` ([#4066](https://github.com/elastic/eui/pull/4066))
-- Updated styles for `EuiToast` ([#4076](https://github.com/elastic/eui/pull/4076))
+- Updarted styles for `EuiToast` ([#4076](https://github.com/elastic/eui/pull/4076))
 - Fixed `line-height` on `EuiTitle` ([#4079](https://github.com/elastic/eui/pull/4079))
 
 ## [`29.1.0`](https://github.com/elastic/eui/tree/v29.1.0)