Updated branch

app/sdks/client-flutter/lib/services/account.dart

@@ -305,11 +305,7 @@ class Account extends Service {
      /// first. Use the success and failure arguments to provide a redirect URL's
      /// back to your app when login is completed.
      ///
-<<<<<<< HEAD:app/sdks/flutter-dart/lib/services/account.dart
-    Future createOAuth2Session({@required String provider, String success = 'https://localhost/auth/oauth2/success', String failure = 'https://localhost/auth/oauth2/failure'}) {
-=======
     Future createOAuth2Session({@required String provider, String success = 'https://appwrite.io/auth/oauth2/success', String failure = 'https://appwrite.io/auth/oauth2/failure'}) {
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/client-flutter/lib/services/account.dart
         final String path = '/account/sessions/oauth2/{provider}'.replaceAll(RegExp('{provider}'), provider);
 
         final Map<String, dynamic> params = {

app/sdks/client-web/src/sdk.js

@@ -712,11 +712,7 @@
              * @throws {Error}
              * @return {Promise}             
              */
-<<<<<<< HEAD:app/sdks/web-javascript/src/sdk.js
-            createOAuth2Session: function(provider, success = 'https://localhost/auth/oauth2/success', failure = 'https://localhost/auth/oauth2/failure') {
-=======
             createOAuth2Session: function(provider, success = 'https://appwrite.io/auth/oauth2/success', failure = 'https://appwrite.io/auth/oauth2/failure') {
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/client-web/src/sdk.js
                 if(provider === undefined) {
                     throw new Error('Missing required parameter: "provider"');
                 }

app/sdks/client-web/src/sdk.min.js

@@ -45,11 +45,7 @@ return http.put(path,{'content-type':'application/json',},payload)},getSessions:
 if(password===undefined){throw new Error('Missing required parameter: "password"')}
 let path='/account/sessions';let payload={};if(email){payload.email=email}
 if(password){payload.password=password}
-<<<<<<< HEAD:app/sdks/web-javascript/src/sdk.min.js
-return http.post(path,{'content-type':'application/json',},payload)},deleteSessions:function(){let path='/account/sessions';let payload={};return http.delete(path,{'content-type':'application/json',},payload)},createOAuth2Session:function(provider,success='https://localhost/auth/oauth2/success',failure='https://localhost/auth/oauth2/failure'){if(provider===undefined){throw new Error('Missing required parameter: "provider"')}
-=======
 return http.post(path,{'content-type':'application/json',},payload)},deleteSessions:function(){let path='/account/sessions';let payload={};return http.delete(path,{'content-type':'application/json',},payload)},createOAuth2Session:function(provider,success='https://appwrite.io/auth/oauth2/success',failure='https://appwrite.io/auth/oauth2/failure'){if(provider===undefined){throw new Error('Missing required parameter: "provider"')}
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/client-web/src/sdk.min.js
 let path='/account/sessions/oauth2/{provider}'.replace(new RegExp('{provider}','g'),provider);let payload={};if(success){payload.success=success}
 if(failure){payload.failure=failure}
 payload.project=config.project;let query=Object.keys(payload).map(key=>key+'='+encodeURIComponent(payload[key])).join('&');window.location=config.endpoint+path+((query)?'?'+query:'')},deleteSession:function(sessionId){if(sessionId===undefined){throw new Error('Missing required parameter: "sessionId"')}

app/sdks/console-web/src/sdk.js

@@ -748,11 +748,7 @@
              * @throws {Error}
              * @return {Promise}             
              */
-<<<<<<< HEAD:app/sdks/console-javascript/src/sdk.js
-            createOAuth2Session: function(provider, success = 'https://localhost/auth/oauth2/success', failure = 'https://localhost/auth/oauth2/failure') {
-=======
             createOAuth2Session: function(provider, success = 'https://appwrite.io/auth/oauth2/success', failure = 'https://appwrite.io/auth/oauth2/failure') {
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/console-web/src/sdk.js
                 if(provider === undefined) {
                     throw new Error('Missing required parameter: "provider"');
                 }
@@ -2177,29 +2173,7 @@
             },
 
             /**
-<<<<<<< HEAD:app/sdks/console-javascript/src/sdk.js
-             * Check the number of pending functions messages
-             *
-             *
-             * @throws {Error}
-             * @return {Promise}             
-             */
-            getQueueFunctions: function() {
-                let path = '/health/queue/functions';
-
-                let payload = {};
-
-                return http
-                    .get(path, {
-                        'content-type': 'application/json',
-                    }, payload);
-            },
-
-            /**
-             * Check the number of pending log messages
-=======
              * Get Functions Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/console-web/src/sdk.js
              *
              *
              * @throws {Error}

app/sdks/console-web/src/sdk.min.js

@@ -45,11 +45,7 @@ return http.put(path,{'content-type':'application/json',},payload)},getSessions:
 if(password===undefined){throw new Error('Missing required parameter: "password"')}
 let path='/account/sessions';let payload={};if(email){payload.email=email}
 if(password){payload.password=password}
-<<<<<<< HEAD:app/sdks/console-javascript/src/sdk.min.js
-return http.post(path,{'content-type':'application/json',},payload)},deleteSessions:function(){let path='/account/sessions';let payload={};return http.delete(path,{'content-type':'application/json',},payload)},createOAuth2Session:function(provider,success='https://localhost/auth/oauth2/success',failure='https://localhost/auth/oauth2/failure'){if(provider===undefined){throw new Error('Missing required parameter: "provider"')}
-=======
 return http.post(path,{'content-type':'application/json',},payload)},deleteSessions:function(){let path='/account/sessions';let payload={};return http.delete(path,{'content-type':'application/json',},payload)},createOAuth2Session:function(provider,success='https://appwrite.io/auth/oauth2/success',failure='https://appwrite.io/auth/oauth2/failure'){if(provider===undefined){throw new Error('Missing required parameter: "provider"')}
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/console-web/src/sdk.min.js
 let path='/account/sessions/oauth2/{provider}'.replace(new RegExp('{provider}','g'),provider);let payload={};if(success){payload.success=success}
 if(failure){payload.failure=failure}
 payload.project=config.project;payload.key=config.key;let query=Object.keys(payload).map(key=>key+'='+encodeURIComponent(payload[key])).join('&');window.location=config.endpoint+path+((query)?'?'+query:'')},deleteSession:function(sessionId){if(sessionId===undefined){throw new Error('Missing required parameter: "sessionId"')}
@@ -137,58 +133,7 @@ if(write){payload.write=write}
 return http.patch(path,{'content-type':'application/json',},payload)},deleteDocument:function(collectionId,documentId){if(collectionId===undefined){throw new Error('Missing required parameter: "collectionId"')}
 if(documentId===undefined){throw new Error('Missing required parameter: "documentId"')}
 let path='/database/collections/{collectionId}/documents/{documentId}'.replace(new RegExp('{collectionId}','g'),collectionId).replace(new RegExp('{documentId}','g'),documentId);let payload={};return http.delete(path,{'content-type':'application/json',},payload)},getCollectionLogs:function(collectionId){if(collectionId===undefined){throw new Error('Missing required parameter: "collectionId"')}
-<<<<<<< HEAD:app/sdks/console-javascript/src/sdk.min.js
-let path='/database/collections/{collectionId}/logs'.replace(new RegExp('{collectionId}','g'),collectionId);let payload={};return http.get(path,{'content-type':'application/json',},payload)}};let functions={list:function(search='',limit=25,offset=0,orderType='ASC'){let path='/functions';let payload={};if(search){payload.search=search}
-if(limit){payload.limit=limit}
-if(offset){payload.offset=offset}
-if(orderType){payload.orderType=orderType}
-return http.get(path,{'content-type':'application/json',},payload)},create:function(name,vars=[],events=[],schedule='',timeout=15){if(name===undefined){throw new Error('Missing required parameter: "name"')}
-let path='/functions';let payload={};if(name){payload.name=name}
-if(vars){payload.vars=vars}
-if(events){payload.events=events}
-if(schedule){payload.schedule=schedule}
-if(timeout){payload.timeout=timeout}
-return http.post(path,{'content-type':'application/json',},payload)},get:function(functionId){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-let path='/functions/{functionId}'.replace(new RegExp('{functionId}','g'),functionId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},update:function(functionId,name,vars=[],events=[],schedule='',timeout=15){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-if(name===undefined){throw new Error('Missing required parameter: "name"')}
-let path='/functions/{functionId}'.replace(new RegExp('{functionId}','g'),functionId);let payload={};if(name){payload.name=name}
-if(vars){payload.vars=vars}
-if(events){payload.events=events}
-if(schedule){payload.schedule=schedule}
-if(timeout){payload.timeout=timeout}
-return http.put(path,{'content-type':'application/json',},payload)},delete:function(functionId){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-let path='/functions/{functionId}'.replace(new RegExp('{functionId}','g'),functionId);let payload={};return http.delete(path,{'content-type':'application/json',},payload)},listExecutions:function(functionId,search='',limit=25,offset=0,orderType='ASC'){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-let path='/functions/{functionId}/executions'.replace(new RegExp('{functionId}','g'),functionId);let payload={};if(search){payload.search=search}
-if(limit){payload.limit=limit}
-if(offset){payload.offset=offset}
-if(orderType){payload.orderType=orderType}
-return http.get(path,{'content-type':'application/json',},payload)},createExecution:function(functionId,async=1){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-let path='/functions/{functionId}/executions'.replace(new RegExp('{functionId}','g'),functionId);let payload={};if(async){payload.async=async}
-return http.post(path,{'content-type':'application/json',},payload)},getExecution:function(functionId,executionId){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-if(executionId===undefined){throw new Error('Missing required parameter: "executionId"')}
-let path='/functions/{functionId}/executions/{executionId}'.replace(new RegExp('{functionId}','g'),functionId).replace(new RegExp('{executionId}','g'),executionId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},updateTag:function(functionId,tag){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-if(tag===undefined){throw new Error('Missing required parameter: "tag"')}
-let path='/functions/{functionId}/tag'.replace(new RegExp('{functionId}','g'),functionId);let payload={};if(tag){payload.tag=tag}
-return http.patch(path,{'content-type':'application/json',},payload)},listTags:function(functionId,search='',limit=25,offset=0,orderType='ASC'){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-let path='/functions/{functionId}/tags'.replace(new RegExp('{functionId}','g'),functionId);let payload={};if(search){payload.search=search}
-if(limit){payload.limit=limit}
-if(offset){payload.offset=offset}
-if(orderType){payload.orderType=orderType}
-return http.get(path,{'content-type':'application/json',},payload)},createTag:function(functionId,env,command,code){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-if(env===undefined){throw new Error('Missing required parameter: "env"')}
-if(command===undefined){throw new Error('Missing required parameter: "command"')}
-if(code===undefined){throw new Error('Missing required parameter: "code"')}
-let path='/functions/{functionId}/tags'.replace(new RegExp('{functionId}','g'),functionId);let payload={};if(env){payload.env=env}
-if(command){payload.command=command}
-if(code){payload.code=code}
-return http.post(path,{'content-type':'application/json',},payload)},getTag:function(functionId,tagId){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-if(tagId===undefined){throw new Error('Missing required parameter: "tagId"')}
-let path='/functions/{functionId}/tags/{tagId}'.replace(new RegExp('{functionId}','g'),functionId).replace(new RegExp('{tagId}','g'),tagId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},deleteTag:function(functionId,tagId){if(functionId===undefined){throw new Error('Missing required parameter: "functionId"')}
-if(tagId===undefined){throw new Error('Missing required parameter: "tagId"')}
-let path='/functions/{functionId}/tags/{tagId}'.replace(new RegExp('{functionId}','g'),functionId).replace(new RegExp('{tagId}','g'),tagId);let payload={};return http.delete(path,{'content-type':'application/json',},payload)}};let health={get:function(){let path='/health';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCache:function(){let path='/health/cache';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getDB:function(){let path='/health/db';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueCertificates:function(){let path='/health/queue/certificates';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueFunctions:function(){let path='/health/queue/functions';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueLogs:function(){let path='/health/queue/logs';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueTasks:function(){let path='/health/queue/tasks';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueUsage:function(){let path='/health/queue/usage';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueWebhooks:function(){let path='/health/queue/webhooks';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getStorageAntiVirus:function(){let path='/health/storage/anti-virus';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getStorageLocal:function(){let path='/health/storage/local';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getTime:function(){let path='/health/time';let payload={};return http.get(path,{'content-type':'application/json',},payload)}};let locale={get:function(){let path='/locale';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getContinents:function(){let path='/locale/continents';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCountries:function(){let path='/locale/countries';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCountriesEU:function(){let path='/locale/countries/eu';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCountriesPhones:function(){let path='/locale/countries/phones';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCurrencies:function(){let path='/locale/currencies';let payload={};return http.get(path,{'content-type':'application/json',},payload)}};let projects={list:function(){let path='/projects';let payload={};return http.get(path,{'content-type':'application/json',},payload)},create:function(name,teamId,description='',logo='',url='',legalName='',legalCountry='',legalState='',legalCity='',legalAddress='',legalTaxId=''){if(name===undefined){throw new Error('Missing required parameter: "name"')}
-=======
 let path='/database/collections/{collectionId}/logs'.replace(new RegExp('{collectionId}','g'),collectionId);let payload={};return http.get(path,{'content-type':'application/json',},payload)}};let health={get:function(){let path='/health';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getAntiVirus:function(){let path='/health/anti-virus';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCache:function(){let path='/health/cache';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getDB:function(){let path='/health/db';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueCertificates:function(){let path='/health/queue/certificates';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueFunctions:function(){let path='/health/queue/functions';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueLogs:function(){let path='/health/queue/logs';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueTasks:function(){let path='/health/queue/tasks';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueUsage:function(){let path='/health/queue/usage';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getQueueWebhooks:function(){let path='/health/queue/webhooks';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getStorageLocal:function(){let path='/health/storage/local';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getTime:function(){let path='/health/time';let payload={};return http.get(path,{'content-type':'application/json',},payload)}};let locale={get:function(){let path='/locale';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getContinents:function(){let path='/locale/continents';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCountries:function(){let path='/locale/countries';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCountriesEU:function(){let path='/locale/countries/eu';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCountriesPhones:function(){let path='/locale/countries/phones';let payload={};return http.get(path,{'content-type':'application/json',},payload)},getCurrencies:function(){let path='/locale/currencies';let payload={};return http.get(path,{'content-type':'application/json',},payload)}};let projects={list:function(){let path='/projects';let payload={};return http.get(path,{'content-type':'application/json',},payload)},create:function(name,teamId,description='',logo='',url='',legalName='',legalCountry='',legalState='',legalCity='',legalAddress='',legalTaxId=''){if(name===undefined){throw new Error('Missing required parameter: "name"')}
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/console-web/src/sdk.min.js
 if(teamId===undefined){throw new Error('Missing required parameter: "teamId"')}
 let path='/projects';let payload={};if(name){payload.name=name}
 if(teamId){payload.teamId=teamId}

app/sdks/console-web/types/index.d.ts

@@ -808,11 +808,7 @@ declare namespace Appwrite {
 	    getQueueCertificates(): Promise<object>;
 
         /**
-<<<<<<< HEAD:app/sdks/console-javascript/types/index.d.ts
-         * Check the number of pending functions messages
-=======
          * Get Functions Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/console-web/types/index.d.ts
          *
 	     *
          * @throws {Error}
@@ -821,11 +817,7 @@ declare namespace Appwrite {
 	    getQueueFunctions(): Promise<object>;
 
         /**
-<<<<<<< HEAD:app/sdks/console-javascript/types/index.d.ts
-         * Check the number of pending log messages
-=======
          * Get Logs Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44:app/sdks/console-web/types/index.d.ts
          *
          * Get the number of logs that are waiting to be processed in the Appwrite
          * internal queue server.

app/sdks/server-java/src/main/java/services/Health.java

@@ -116,11 +116,7 @@ public class Health extends Service {
         return client.call("GET", path, headers, params);
     }
 
-<<<<<<< HEAD
-     /// Check the number of pending functions messages
-=======
      /// Get Functions Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
     public Call getQueueFunctions() {
         final String path = "/health/queue/functions";
 
@@ -136,11 +132,7 @@ public class Health extends Service {
         return client.call("GET", path, headers, params);
     }
 
-<<<<<<< HEAD
-     /// Check the number of pending log messages
-=======
      /// Get Logs Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
      /*
      * Get the number of logs that are waiting to be processed in the Appwrite
      * internal queue server.

app/sdks/server-nodejs/lib/services/health.js

@@ -96,11 +96,7 @@ class Health extends Service {
     }
 
     /**
-<<<<<<< HEAD
-     * Check the number of pending functions messages
-=======
      * Get Functions Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
      *
      * @throws Exception
      * @return {}
@@ -116,11 +112,7 @@ class Health extends Service {
     }
 
     /**
-<<<<<<< HEAD
-     * Check the number of pending log messages
-=======
      * Get Logs Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
      *
      * Get the number of logs that are waiting to be processed in the Appwrite
      * internal queue server.

app/sdks/server-php/docs/health.md

@@ -40,21 +40,13 @@ GET https://appwrite.io/v1/health/queue/certificates
 
 ** Get the number of certificates that are waiting to be issued against [Letsencrypt](https://letsencrypt.org/) in the Appwrite internal queue server. **
 
-<<<<<<< HEAD
-## Check the number of pending functions messages
-=======
 ## Get Functions Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
 
 ```http request
 GET https://appwrite.io/v1/health/queue/functions
 ```
 
-<<<<<<< HEAD
-## Check the number of pending log messages
-=======
 ## Get Logs Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
 
 ```http request
 GET https://appwrite.io/v1/health/queue/logs

app/sdks/server-php/src/Appwrite/Services/Health.php

@@ -107,11 +107,7 @@ class Health extends Service
     }
 
     /**
-<<<<<<< HEAD
-     * Check the number of pending functions messages
-=======
      * Get Functions Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
      *
      * @throws Exception
      * @return array
@@ -128,11 +124,7 @@ class Health extends Service
     }
 
     /**
-<<<<<<< HEAD
-     * Check the number of pending log messages
-=======
      * Get Logs Queue
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
      *
      * Get the number of logs that are waiting to be processed in the Appwrite
      * internal queue server.

app/sdks/server-python/appwrite/services/health.py

@@ -57,11 +57,7 @@ class Health(Service):
         }, params)
 
     def get_queue_functions(self):
-<<<<<<< HEAD
-        """Check the number of pending functions messages"""
-=======
         """Get Functions Queue"""
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
 
         params = {}
         path = '/health/queue/functions'

app/sdks/server-ruby/lib/appwrite/services/health.rb

@@ -58,20 +58,6 @@ module Appwrite
 
         def get_queue_functions()
             path = '/health/queue/functions'
-<<<<<<< HEAD
-
-            params = {
-            }
-
-            return @client.call('get', path, {
-                'content-type' => 'application/json',
-            }, params);
-        end
-
-        def get_queue_logs()
-            path = '/health/queue/logs'
-=======
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
 
             params = {
             }

public/dist/scripts/app-all.js

@@ -2363,8 +2363,7 @@ object=object[path.shift()];}
 let shift=path.shift();if(value!==null&&value!==undefined&&object&&shift&&(object[shift]!==undefined||object[shift]!==null)){switch(type){case'append':if(!Array.isArray(object[shift])){object[shift]=[];}
 object[shift].push(value);break;case'prepend':if(!Array.isArray(object[shift])){object[shift]=[];}
 object[shift].unshift(value);break;case'splice':if(!Array.isArray(object[shift])){object[shift]=[];}
-object[shift].splice(value,1);break;case'merge':if(!typeof object[shift]!=='object'){object[shift]={};}
-console.log('object[shift]',object[shift]);console.log('object',object);console.log('shift',shift);console.log('value',value);console.log('result',{...object[shift],...value});object[shift]={...object[shift],...value};break;default:object[shift]=value;}
+object[shift].splice(value,1);break;default:object[shift]=value;}
 return true;}
 if(!object){return null;}
 if(!shift){result=object;}else{return object[shift];}

public/dist/scripts/app.js

@@ -22,8 +22,7 @@ object=object[path.shift()];}
 let shift=path.shift();if(value!==null&&value!==undefined&&object&&shift&&(object[shift]!==undefined||object[shift]!==null)){switch(type){case'append':if(!Array.isArray(object[shift])){object[shift]=[];}
 object[shift].push(value);break;case'prepend':if(!Array.isArray(object[shift])){object[shift]=[];}
 object[shift].unshift(value);break;case'splice':if(!Array.isArray(object[shift])){object[shift]=[];}
-object[shift].splice(value,1);break;case'merge':if(!typeof object[shift]!=='object'){object[shift]={};}
-console.log('object[shift]',object[shift]);console.log('object',object);console.log('shift',shift);console.log('value',value);console.log('result',{...object[shift],...value});object[shift]={...object[shift],...value};break;default:object[shift]=value;}
+object[shift].splice(value,1);break;default:object[shift]=value;}
 return true;}
 if(!object){return null;}
 if(!shift){result=object;}else{return object[shift];}

public/styles/fontello/config.json

@@ -663,8 +663,6 @@
       "search": [
         "49958"
       ]
-<<<<<<< HEAD
-=======
     },
     {
       "uid": "ef4f1a4b96dccf59cc7ba28aae651f94",
@@ -679,7 +677,6 @@
       "search": [
         "dev"
       ]
->>>>>>> 1d96911000c2322cd8c363449837bc103f427c44
     }
   ]
 }