chore: fix broken merge

Author: paambaati

CHANGELOG.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # [2.0.0-beta.9](https://github.com/paambaati/neon-js-sdk/compare/v2.0.0-beta.8...v2.0.0-beta.9) (2024-08-08)
 
 
@@ -90,8 +89,6 @@
 
 * move to @hey-api/openapi-ts, as openapi-typescript-codegen is being deprecated
 
-||||||| e7dd037
-=======
 # [1.30.0](https://github.com/paambaati/neon-js-sdk/compare/v1.29.2...v1.30.0) (2025-02-28)
 
 
@@ -145,7 +142,6 @@
 * update to track latest spec changes ([68810e4](https://github.com/paambaati/neon-js-sdk/commit/68810e429c06ebff789d1da3caaf1c6a019a9131))
 * update to track latest spec changes ([bbb16e0](https://github.com/paambaati/neon-js-sdk/commit/bbb16e055035060fec8ec742ea9a283d656162b0))
 
->>>>>>> main
 # [1.26.0](https://github.com/paambaati/neon-js-sdk/compare/v1.25.0...v1.26.0) (2024-08-12)
 
 

generated/NeonClient.ts

@@ -2,95 +2,6 @@ import type { BaseHttpRequest } from './core/BaseHttpRequest';
 import type { OpenAPIConfig } from './core/OpenAPI';
 import { Interceptors } from './core/OpenAPI';
 import { FetchHttpRequest } from './core/FetchHttpRequest';
-<<<<<<< HEAD
-||||||| e7dd037
-import { ApiKeyService } from './services/ApiKeyService';
-import { BranchService } from './services/BranchService';
-import { ConsumptionService } from './services/ConsumptionService';
-import { EndpointService } from './services/EndpointService';
-import { OperationService } from './services/OperationService';
-import { ProjectService } from './services/ProjectService';
-import { UsersService } from './services/UsersService';
-type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest;
-export class NeonClient {
-    public readonly apiKey: ApiKeyService;
-    public readonly branch: BranchService;
-    public readonly consumption: ConsumptionService;
-    public readonly endpoint: EndpointService;
-    public readonly operation: OperationService;
-    public readonly project: ProjectService;
-    public readonly users: UsersService;
-    public readonly request: BaseHttpRequest;
-    constructor(config?: Partial<OpenAPIConfig>, HttpRequest: HttpRequestConstructor = FetchHttpRequest) {
-        this.request = new HttpRequest({
-            BASE: config?.BASE ?? 'https://console.neon.tech/api/v2',
-            VERSION: config?.VERSION ?? '2',
-            WITH_CREDENTIALS: config?.WITH_CREDENTIALS ?? false,
-            CREDENTIALS: config?.CREDENTIALS ?? 'include',
-            TOKEN: config?.TOKEN,
-            USERNAME: config?.USERNAME,
-            PASSWORD: config?.PASSWORD,
-            HEADERS: config?.HEADERS,
-            ENCODE_PATH: config?.ENCODE_PATH,
-        });
-        this.apiKey = new ApiKeyService(this.request);
-        this.branch = new BranchService(this.request);
-        this.consumption = new ConsumptionService(this.request);
-        this.endpoint = new EndpointService(this.request);
-        this.operation = new OperationService(this.request);
-        this.project = new ProjectService(this.request);
-        this.users = new UsersService(this.request);
-    }
-}
-=======
-import { ApiKeyService } from './services/ApiKeyService';
-import { AuthService } from './services/AuthService';
-import { BranchService } from './services/BranchService';
-import { ConsumptionService } from './services/ConsumptionService';
-import { EndpointService } from './services/EndpointService';
-import { OperationService } from './services/OperationService';
-import { OrganizationsService } from './services/OrganizationsService';
-import { ProjectService } from './services/ProjectService';
-import { RegionService } from './services/RegionService';
-import { UsersService } from './services/UsersService';
-type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest;
-export class NeonClient {
-    public readonly apiKey: ApiKeyService;
-    public readonly auth: AuthService;
-    public readonly branch: BranchService;
-    public readonly consumption: ConsumptionService;
-    public readonly endpoint: EndpointService;
-    public readonly operation: OperationService;
-    public readonly organizations: OrganizationsService;
-    public readonly project: ProjectService;
-    public readonly region: RegionService;
-    public readonly users: UsersService;
-    public readonly request: BaseHttpRequest;
-    constructor(config?: Partial<OpenAPIConfig>, HttpRequest: HttpRequestConstructor = FetchHttpRequest) {
-        this.request = new HttpRequest({
-            BASE: config?.BASE ?? 'https://console.neon.tech/api/v2',
-            VERSION: config?.VERSION ?? '2',
-            WITH_CREDENTIALS: config?.WITH_CREDENTIALS ?? false,
-            CREDENTIALS: config?.CREDENTIALS ?? 'include',
-            TOKEN: config?.TOKEN,
-            USERNAME: config?.USERNAME,
-            PASSWORD: config?.PASSWORD,
-            HEADERS: config?.HEADERS,
-            ENCODE_PATH: config?.ENCODE_PATH,
-        });
-        this.apiKey = new ApiKeyService(this.request);
-        this.auth = new AuthService(this.request);
-        this.branch = new BranchService(this.request);
-        this.consumption = new ConsumptionService(this.request);
-        this.endpoint = new EndpointService(this.request);
-        this.operation = new OperationService(this.request);
-        this.organizations = new OrganizationsService(this.request);
-        this.project = new ProjectService(this.request);
-        this.region = new RegionService(this.request);
-        this.users = new UsersService(this.request);
-    }
-}
->>>>>>> main
 
 import { ApiKeyService } from './services.gen';
 import { AuthService } from './services.gen';