fix: merge conflict resolved

push-protocol · Oct 26, 2023 · 637644b · 637644b
1 parent e1d9cf7
commit 637644b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/restapi/src/lib/pushNotification/pushNotificationBase.ts b/packages/restapi/src/lib/pushNotification/pushNotificationBase.ts
@@ -661,7 +661,7 @@ export class PushNotificationBaseClass {
     return 0;
   }
 
-  public getMinimalSetting(configuration: NotificationSettings): {
+  protected getMinimalSetting(configuration: NotificationSettings): {
     setting: string;
     description: string;
   } {

diff --git a/packages/restapi/tests/lib/pushNotification/channel.test.ts b/packages/restapi/tests/lib/pushNotification/channel.test.ts
@@ -286,7 +286,7 @@ describe('PushAPI.channel functionality', () => {
     }, 10000000000);
   });
 
-  describe.only('channel :: settings', () => {
+  describe.skip('channel :: settings', () => {
     it('Should create channel', async () => {
       const res = await userKate.channel.setting([
         {type: 2, default: 5, description: "My notif setting 2", data: {upper:100, lower:5, ticker: 10, enabled: true}},