@thecb/components 7.1.1-beta.1 → 7.1.1-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/atoms/icons/index.js +0 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thecb/components",
3
- "version": "7.1.1-beta.1",
3
+ "version": "7.1.1-beta.2",
4
4
  "description": "Common lib for CityBase react components",
5
5
  "main": "dist/index.cjs.js",
6
6
  "typings": "dist/index.d.ts",
package/src/components/atoms/icons/index.js CHANGED
@@ -57,13 +57,10 @@ import PeriscopeFailedIcon from "./PeriscopeFailedIcon";
57
57
  import CheckIcon from "./CheckIcon";
58
58
  import WarningIconXS from "./WarningIconXS";
59
59
  import CashIcon from "./CashIcon";
60
- <<<<<<< HEAD
61
60
  import WalletBannerIcon from "./WalletBannerIcon";
62
- =======
63
61
  import StandardCheckoutImage from "./StandardCheckoutImage";
64
62
  import GuidedCheckoutImage from "./GuidedCheckoutImage";
65
63
  import ProfileImage from "./ProfileImage";
66
- >>>>>>> b7fda3a (SRV-3841 Adding ProfileImage, StandardCheckoutImage, GuidedCheckoutImage. Card now accepts either imgSrc or imgName)
67
64
 
68
65
  export {
69
66
  AccountsIcon,