diff --git a/CHANGELOG.md b/CHANGELOG.md index a7b18ca..b11d3af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- Remove merge marker from code ## [0.62.1] - 2024-12-04 ### Added diff --git a/graphql/schema.graphql b/graphql/schema.graphql index ff0277e..817125b 100644 --- a/graphql/schema.graphql +++ b/graphql/schema.graphql @@ -533,11 +533,8 @@ type TopBarSettings { type UISettings { showModal: Boolean clearCart: Boolean -<<<<<<< HEAD fullImpersonation: Boolean -======= topBar: TopBarSettings ->>>>>>> 723475d (feat: add topBar settings type) } scalar Data @@ -698,11 +695,8 @@ input TopBarSettingsInput { input UISettingsInput { showModal: Boolean clearCart: Boolean -<<<<<<< HEAD fullImpersonation: Boolean -======= topBar: TopBarSettingsInput ->>>>>>> 723475d (feat: add topBar settings type) } input B2BSettingsInput { diff --git a/manifest.json b/manifest.json index 02e622d..4fa0cd8 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "b2b-organizations-graphql", "vendor": "vtex", - "version": "0.62.1", + "version": "0.62.2", "title": "B2B Organizations", "description": "App to create and manage B2B Organizations and Cost Centers", "mustUpdateAt": "2022-08-28", diff --git a/node/typings.d.ts b/node/typings.d.ts index 5b1e080..75cb588 100644 --- a/node/typings.d.ts +++ b/node/typings.d.ts @@ -247,11 +247,8 @@ interface TopBarSetting { interface UISettings { showModal: boolean clearCart: boolean -<<<<<<< HEAD fullImpersonation: boolean -======= topBar?: TopBarSetting | null ->>>>>>> 723475d (feat: add topBar settings type) } interface CustomField { diff --git a/node/yarn.lock b/node/yarn.lock index 54d1054..abebf46 100644 --- a/node/yarn.lock +++ b/node/yarn.lock @@ -3475,7 +3475,7 @@ stack-utils@^2.0.3: dependencies: escape-string-regexp "^2.0.0" -"stats-lite@github:vtex/node-stats-lite#dist": +stats-lite@vtex/node-stats-lite#dist: version "2.2.0" resolved "https://codeload.github.com/vtex/node-stats-lite/tar.gz/1b0d39cc41ef7aaecfd541191f877887a2044797" dependencies: