Skip to content

Commit

Permalink
Creating a conflict to merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
cchaos authored and cchaos committed Sep 30, 2020
1 parent f3a4128 commit 72818ab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 72818ab

Please sign in to comment.