resolve conflicts

CHANGELOG.md

@@ -3,7 +3,10 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 2.0.174 | [PR#3593](https://github.com/bbc/psammead/pull/3593) Talos - Bump Dependencies - @bbc/psammead-paragraph, @bbc/psammead-section-label |
+| 2.0.177 | [PR#3593](https://github.com/bbc/psammead/pull/3593) Talos - Bump Dependencies - @bbc/psammead-paragraph, @bbc/psammead-section-label |
+| 2.0.176 | [PR#3599](https://github.com/bbc/psammead/pull/3599) Talos - Bump Dependencies - @bbc/psammead-radio-schedule |
+| 2.0.175 | [PR#3598](https://github.com/bbc/psammead/pull/3598) Talos - Bump Dependencies - @bbc/psammead-calendars, @bbc/psammead-timestamp-container |
+| 2.0.174 | [PR#3596](https://github.com/bbc/psammead/pull/3596) Talos - Bump Dependencies - @bbc/psammead-locales |
 | 2.0.173 | [PR#3587](https://github.com/bbc/psammead/pull/3587) Bump Dependencies - @bbc/psammead-storybook-helpers |
 | 2.0.172 | [PR#3584](https://github.com/bbc/psammead/pull/3584) Talos - Bump Dependencies - @bbc/psammead-media-player |
 | 2.0.171 | [PR#3571](https://github.com/bbc/psammead/pull/3571) Adding new packages to the base package.json |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead",
-  "version": "2.0.174",
+  "version": "2.0.177",
   "description": "Core Components Library Developed & Maintained By The Articles and Reach & Languages Team",
   "main": "index.js",
   "private": true,
@@ -56,7 +56,7 @@
     "@bbc/psammead-bulleted-list": "^1.0.10",
     "@bbc/psammead-bulletin": "^3.2.4",
     "@bbc/psammead-byline": "^1.0.5",
-    "@bbc/psammead-calendars": "^2.0.14",
+    "@bbc/psammead-calendars": "^2.0.15",
     "@bbc/psammead-caption": "^2.2.28",
     "@bbc/psammead-consent-banner": "^2.3.30",
     "@bbc/psammead-content-anchor": "^1.0.0-alpha.1",
@@ -71,14 +71,14 @@
     "@bbc/psammead-image-placeholder": "^1.2.36",
     "@bbc/psammead-inline-link": "^1.3.22",
     "@bbc/psammead-live-label": "^1.0.0",
-    "@bbc/psammead-locales": "^4.1.9",
+    "@bbc/psammead-locales": "^4.1.10",
     "@bbc/psammead-media-indicator": "^4.0.7",
     "@bbc/psammead-media-player": "^2.7.13",
     "@bbc/psammead-most-read": "^4.1.4",
     "@bbc/psammead-navigation": "^6.0.11",
     "@bbc/psammead-paragraph": "^2.2.30",
     "@bbc/psammead-play-button": "^1.1.16",
-    "@bbc/psammead-radio-schedule": "3.0.6",
+    "@bbc/psammead-radio-schedule": "3.0.7",
     "@bbc/psammead-rich-text-transforms": "^2.0.2",
     "@bbc/psammead-script-link": "^1.0.15",
     "@bbc/psammead-section-label": "^5.0.8",
@@ -90,7 +90,7 @@
     "@bbc/psammead-styles": "^4.4.0",
     "@bbc/psammead-test-helpers": "^3.1.5",
     "@bbc/psammead-timestamp": "^2.2.28",
-    "@bbc/psammead-timestamp-container": "^4.0.1",
+    "@bbc/psammead-timestamp-container": "^4.0.2",
     "@bbc/psammead-useful-links": "^1.0.18",
     "@bbc/psammead-visually-hidden-text": "^1.3.0",
     "@loadable/babel-plugin": "^5.13.0",

packages/components/psammead-radio-schedule/CHANGELOG.md

@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 3.0.7 | [PR#3598](https://github.com/bbc/psammead/pull/3598) Talos - Bump Dependencies - @bbc/psammead-timestamp-container |
 | 3.0.6 | [PR#3525](https://github.com/bbc/psammead/pull/3525) Talos - Bump Dependencies - @bbc/psammead-timestamp-container |
 | 3.0.5 | [PR#3485](https://github.com/bbc/psammead/pull/3485) Talos - Bump Dependencies - @bbc/psammead-timestamp-container |
 | 3.0.4 | [PR#3475](https://github.com/bbc/psammead/pull/3475) Talos - Bump Dependencies - @bbc/psammead-timestamp-container |

packages/components/psammead-radio-schedule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-radio-schedule",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,
@@ -23,7 +23,7 @@
     "@bbc/psammead-assets": "^2.14.0",
     "@bbc/psammead-live-label": "^1.0.0",
     "@bbc/psammead-styles": "^4.4.0",
-    "@bbc/psammead-timestamp-container": "^4.0.1",
+    "@bbc/psammead-timestamp-container": "^4.0.2",
     "@bbc/psammead-detokeniser": "^1.0.0"
   },
   "peerDependencies": {

packages/components/psammead-story-promo-list/CHANGELOG.md

@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 | ------- | ----------- |
+| 4.1.0 | [PR#3588](https://github.com/bbc/psammead/pull/3588) Added `StoryPromoLiBase` to support configurable padding/margin rules |
 | 4.0.8 | [PR#3467](https://github.com/bbc/psammead/pull/3467) Talos - Bump Dependencies - @bbc/psammead-styles |
 | 4.0.7 | [PR#3397](https://github.com/bbc/psammead/pull/3397) Talos - Bump Dependencies - @bbc/psammead-styles |
 | 4.0.6 | [PR#3315](https://github.com/bbc/psammead/pull/3315) Add `border` prop to be able to hide the border |

packages/components/psammead-story-promo-list/README.md

@@ -2,7 +2,7 @@
 
 ## Description
 
-The `@bbc/psammead-story-promo-list` package is a set of two components, `StoryPromoUl` and `StoryPromoLi`. They use `ul` and `li` HTML elements respectively.
+The `@bbc/psammead-story-promo-list` package is a set of three components, `StoryPromoUl`, `StoryPromoLi` and `StoryPromoLiBase`. They use `ul` and `li` HTML elements respectively. The `StoryPromoLi` and `StoryPromoLiBase` components are both `li` elements and can be used interchangeably as they have similar props the only difference is that the `StoryPromoLiBase` ships with no padding presets thereby making it much more configurable to any set of padding/margin rules set on child elements.
 
 ## Installation
 

packages/components/psammead-story-promo-list/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-story-promo-list",
-  "version": "4.0.8",
+  "version": "4.1.0",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,