conflict_resolution
stringlengths
27
16k
<<<<<<< import { ProgressIndicatorDemoComponent } from './progress-indicator/progress-indicator-demo.component'; ======= import { ModalDemoComponent } from './modal/modal-demo.component'; >>>>>>> import { ProgressIndicatorDemoComponent } from './progress-indicator/progress-indicator-demo.component'; import { ModalDe...
<<<<<<< import { NavbarModule } from 'app/lib/navbar/navbar.module'; import { PopoverModule } from 'app/lib/popover/popover.module'; import { NavbarDemoComponent } from 'app/lib/navbar/navbar-demo/navbar-demo.component'; import { PopoverDemoComponent } from 'app/lib/popover/popover-demo/popover-demo.component'; ======...
<<<<<<< import {PersonaModule} from './personas/persona.module'; ======= import {MarkdownContentComponent} from './markdown-content.component'; import {LogoDemoComponent} from './logo/logo-demo.component'; import {ProductsDemoComponent} from './products/products-demo.component'; import {UsageComponent} from './usage/...
<<<<<<< <hc-navbar brandIcon="./assets/TriFlame.svg" user="Christine K." [homeUri]="undefined" [fixedTop]="false"> <hc-navbar-link [active]="true" uri="undefined" linkText="Home"></hc-navbar-link> <hc-navbar-mobile-menu> <hc-list> <hc-list-item routerL...
<<<<<<< export * from './navbar/navbar.module'; export * from './popover/popover.module'; export * from './app-switcher/app-switcher.module'; ======= export * from './icon/icon.module'; export * from './drawer/drawer.module'; >>>>>>> export * from './navbar/navbar.module'; export * from './popover/popover.module'; e...
<<<<<<< ModalModule, ======= SharedModule, >>>>>>> ModalModule, SharedModule,
<<<<<<< import { TypographyDemoComponent } from './typography/typography-demo.component'; ======= import { BreadcrumbsModule } from '../../../lib/src/breadcrumbs/breadcrumbs.module'; import { BreadcrumbsDemoComponent } from './breadcrumbs/breadcrumbs-demo.component'; import { Breadcrumb1DemoComponent } from './breadc...
<<<<<<< if (config.githubCheck !== undefined) { const {appId, installationId, repo, commit} = config.githubCheck; ======= if (opts['github-check'] !== '') { const {label, appId, installationId, repo, commit} = github.parseCheckFlag(opts['github-check']); >>>>>>> if (config.githubCheck !== undef...
<<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbr...
<<<<<<< export * from './Languages'; export * from './TermsOfService'; ======= export * from './TermsOfService'; export * from './TopUp'; >>>>>>> export * from './Languages'; export * from './TermsOfService'; export * from './TopUp';
<<<<<<< export const MIN_DEPOSIT_CLI_VERSION = process.env.REACT_APP_MIN_DEPOSIT_CLI_VERSION || '0.2.1'; // 0.2.1 was for Medalla ======= export const LIGHTHOUSE_INSTALLATION_URL = process.env.REACT_APP_LIGHTHOUSE_INSTALLATION_URL || 'https://lighthouse-book.sigmaprime.io/installation.html'; export const NIMBUS_...
<<<<<<< import { Destroyable } from "../types/Destroyable"; import { TextMetrics } from "../types/TextMetrics"; ======= import { TextMetrix } from "../types/TextMetrix"; >>>>>>> import { TextMetrics } from "../types/TextMetrics";
<<<<<<< function typografTextWithNeighbors(node: string, prevWord?: string, nextWord?: string): string { const words: string[] = [] ======= export function typografTextWithNeighbors(node: string, prevWord?: string, nextWord?: string): string { let words: string[] = [] >>>>>>> export function typografTextWithNeig...
<<<<<<< import AppStateRepository from '~/repository/AppStateRepository' ======= import { AppStateRepository } from '~/repository/AppStateRepository' import { Instance } from 'mobx-state-tree' >>>>>>> import { AppStateRepository } from '~/repository/AppStateRepository' <<<<<<< import Quiz from '~/models/quiz' ====...
<<<<<<< fontSizeSmall: `0.9rem`, adaptiveBreakpoint: '800px' ======= fontSizeRegular: `1rem`, fontSizeSmall: `0.9rem` >>>>>>> fontSizeRegular: `1rem`, fontSizeSmall: `0.9rem`, adaptiveBreakpoint: '800px'
<<<<<<< import { botDefaultSettings } from './settings'; import { BotType, ShardCommand } from './types'; ======= import { CaptchaService } from './services/Captcha'; import { CommandsService } from './services/Commands'; import { DBQueueService } from './services/DBQueue'; import { InvitesService } from './services/...
<<<<<<< ActivityStatus, ActivityType, ======= AnnouncementVoice, >>>>>>> ActivityStatus, ActivityType, AnnouncementVoice, <<<<<<< } ======= musicVolume: number; announceNextSong: boolean; announcementVoice: AnnouncementVoice; fadeMusicOnTalk: boolean; fadeMusicStartDuration: number; fadeMusicEndDel...
<<<<<<< import { TrackingService } from './services/Tracking'; ======= import { botDefaultSettings } from './settings'; >>>>>>> import { TrackingService } from './services/Tracking'; import { botDefaultSettings } from './settings';
<<<<<<< import { Constants, ServerHashParamKeys, InteractionType, libraryVersion, CacheKeys } from "./utils/Constants"; ======= import { Constants, InteractionType, libraryVersion } from "./utils/Constants"; >>>>>>> import { Constants, ServerHashParamKeys, InteractionType, libraryVersion, CacheKeys } from "./utils/C...
<<<<<<< ======= import { Guild, Lang, Message } from '@yamdbf/core'; >>>>>>> <<<<<<< } from 'eris'; ======= } from 'discord.js'; import moment from 'moment'; import { createCaptcha, FileMode } from './functions/Captcha'; >>>>>>> } from 'eris'; import { createCaptcha, FileMode } from './functions/Captcha'; <<<...
<<<<<<< export const DEFAULT_AUTHORITY: string = "https://login.microsoftonline.com/common"; export const AAD_INSTANCE_DISCOVERY_ENDPOINT: string = `${DEFAULT_AUTHORITY}/discovery/instance?api-version=1.1&authorization_endpoint=${DEFAULT_AUTHORITY}/oauth2/v2.0/authorize`; export const WELL_KNOWN_SUFFIX: string = ".well...
<<<<<<< RankAssignmentStyle } from './models/GuildSetting'; import { InviteCodeSettingsKey } from './models/InviteCodeSetting'; import { MemberSettingsKey } from './models/MemberSetting'; ======= MemberSettingsKey, RankAssignmentStyle, SettingsKey } from './sequelize'; import { MusicPlatformType } from './types';...
<<<<<<< import { AppController } from './app.controller'; import { AppService } from './app.service'; ======= import { AppController } from './controllers/app.controller'; import { AppService } from './services/app.service'; import { PrismaModule } from './prisma/prisma.module'; >>>>>>> import { AppController } from...
<<<<<<< async createUrl( request: AuthorizationUrlRequest ): Promise<string> { ======= async createAcquireTokenUrl(request: AuthorizationUrlRequest): Promise<string> { return this.createUrl(request, false); } /** * Helper function which creates URL. If isLoginCall is true, MS...
<<<<<<< export const SET_VECTOR_LAYER = '__layers__SET_VECTOR_LAYER'; export const SET_SELECTED_LAYERS = '__layers__SET_SELECTED_LAYERS'; export const SET_HOVERED_LAYER = '__layers__SET_HOVERED_LAYER'; export const SET_HIDDEN_LAYERS = '__layers__SET_HIDDEN_LAYERS'; export const SET_COLLAPSED_LAYERS = '__layers__SET_COL...
<<<<<<< readonly selectedLayerIds: Set<string>; readonly hoveredLayerId: string; readonly collapsedLayerIds: Set<string>; readonly hiddenLayerIds: Set<string>; ======= readonly selectedLayerIds: ReadonlySet<string>; readonly collapsedLayerIds: ReadonlySet<string>; readonly hiddenLayerIds: ReadonlySet<st...
<<<<<<< import { separate } from './Multiple'; ======= type ReadonlyTable<T> = ReadonlyArray<ReadonlyArray<T>>; >>>>>>> import { separate } from './Multiple'; type ReadonlyTable<T> = ReadonlyArray<ReadonlyArray<T>>;
<<<<<<< YowizPanel.viewType, 'Yeoman UI', ======= YeomanUIPanel.viewType, 'YeomanUI', >>>>>>> YeomanUIPanel.viewType, 'Yeoman UI', <<<<<<< ======= const webview = this.panel.webview; // Vary the webview's content based on where it is located in the editor. switch (this.panel.viewColumn) {...
<<<<<<< const generators: IPrompt = await this.getGenerators(); const response: any = await this.rpc.invoke("showPrompt", [generators.questions, generators.name]); await this.runGenerator(response.name); ======= if (this.rpc) { const generators: IPrompt = await this.getGenerators(); ...
<<<<<<< import * as services from './services'; ======= import { request } from './utils'; import * as ssl from './ssl'; >>>>>>> import { request } from './utils'; import * as services from './services'; <<<<<<< async function GetRemoteFile(link: string, encoding = 'utf8') { const options: request.CoreOptions = {...
<<<<<<< if (${slot} && ${update_conditions}) { ${slot}.p(@get_slot_changes(${slot_definition}, ctx, changed, ${get_slot_changes}), @get_slot_context(${slot_definition}, ctx, ${get_slot_context})); ======= if (${slot} && ${slot}.p && ${update_conditions}) { ${slot}.p(@assign(@assign({}, ${get_slot_change...
<<<<<<< updater = block.renderer.options.dev ? `@prop_dev(${element.var}, "${property_name}", ${should_cache ? last : value});` : `${element.var}.${property_name} = ${should_cache ? last : value};`; } else if (is_dataset) { block.builders.hydrate.add_line( `${element.var}.dataset.${camel_case_...
<<<<<<< method?: string; ts: number, ======= timestamp: number, >>>>>>> timestamp: number, method?: string; <<<<<<< if (urlContainsHash) { const stateInfo = this.getResponseState(urlHash); if (stateInfo.method === Constants.interactionTypeRedirect) { ...
<<<<<<< const start = state === (ProposalStates.Boosted || state == ProposalStates.BoostedTimedOut) ? boostedTime : submittedTime; const duration = state === (ProposalStates.Boosted || state == ProposalStates.BoostedTimedOut) ? boostedVotePeriodLimit : preBoostedVotePeriodLimit; ======= const start = (state == ...
<<<<<<< import { IProposalState, ProposalStates, closingTime } from "reducers/arcReducer"; import * as schemas from "../schemas"; import * as moment from 'moment'; ======= import { IProposalState, ProposalStates } from "reducers/arcReducer"; import * as schemas from "schemas"; >>>>>>> import { IProposalState, Propos...
<<<<<<< } else if (url == null) { ======= } else if (segment.mediaURL === null) { >>>>>>> } else if (url === null) {
<<<<<<< export const DAT_TOKEN = 'dat'; export const DCT_TOKEN = 'dct'; export const SWAP = 'swap'; export const POOL = 'pool'; export const DELETE = 'delete'; export const CREATE_DCT = 'dat'; export const MINIMUM_DFI_REQUIRED_FOR_TOKEN_CREATION = 100; export const DCT_DISTRIBUTION = 'dct'; export const TOKEN_TRANSFERS...
<<<<<<< protected async buildOauthClientConfiguration(authority: string, serverTelemetryManager?: ServerTelemetryManager): Promise<ClientConfiguration> { ======= /** * Returns the logger instance */ getLogger(): Logger { return this.logger; } /** * Replaces the default logg...
<<<<<<< export const BLOCKCHAIN_START_SUCCESS = 'blockchain started successfully'; export const MAX_MONEY = 21000000; ======= export const BLOCKCHAIN_START_SUCCESS = 'blockchain started successfully'; export const GET_NEW_ADDRESS_TYPE = 'legacy'; >>>>>>> export const BLOCKCHAIN_START_SUCCESS = 'blockchain started su...
<<<<<<< }; export const getFormattedTime = () => { const today = new Date(); const y = today.getFullYear(); const m = today.getMonth() + 1; const d = today.getDate(); const h = today.getHours(); const mi = today.getMinutes(); const s = today.getSeconds(); return `${y}-${m}-${d}_${h}-${mi}-${s}`; =====...
<<<<<<< import { BigNumber } from 'bignumber.js'; ======= import { PeerInfoModel } from 'src/constants/rpcModel'; >>>>>>> import { BigNumber } from 'bignumber.js'; import { PeerInfoModel } from 'src/constants/rpcModel';
<<<<<<< MASTERNODE_PARAMS_INCLUDE_FROM_START, MASTERNODE_PARAMS_MASTERNODE_LIMIT, ======= WALLET_UNLOCK_TIMEOUT, MASTERNODE_PARAMS_INCLUDE_FROM_START, MASTERNODE_PARAMS_MASTERNODE_LIMIT, >>>>>>> WALLET_UNLOCK_TIMEOUT, MASTERNODE_PARAMS_INCLUDE_FROM_START, MASTERNODE_PARAMS_MASTERNODE_LIMIT, <<<<<<< ...
<<<<<<< export const getTxnSize = async (): Promise<number> => { const rpcClient = new RpcClient(); const unspent = await rpcClient.listUnspent(MAX_MONEY); const inputs = unspent.length; const outputs = 2; return inputs * 180 + outputs * 34 + 10 + inputs; }; ======= export const toSha256 = (value): any =>...
<<<<<<< export { AdminUserService } from './adminUser.service' export { AdminUserController } from './adminUser.controller' export { LocalStrategy } from './local.strategy' ======= export { AdminUserService } from './adminUser.service' export { default as DefaultAdminModule } from './defaultAdmin.module' >>>>>>> exp...
<<<<<<< const resp = await this.client.rest.post(CHANNEL_MESSAGES(this.id), { ======= if (this.client.user === undefined) { throw new Error('Client user has not initialized.') } const resp = await fetch(CHANNEL_MESSAGES(this.id), { headers: { Authorization: `Bot ${this.client.toke...
<<<<<<< } export interface GuildWidgetPayload { id: string name: string instant_invite: string channels: Array<{ id: string; name: string; position: number }> members: MemberPayload[] presence_count: number ======= } export type GuildChannelPayloads = | GuildTextChannelPayload | GuildVoiceChannelPay...
<<<<<<< import { Invite } from '../structures/invite.ts' import { INVITE } from '../types/endpoint.ts' ======= import { ClientEvents } from '../gateway/handlers/index.ts' >>>>>>> import { Invite } from '../structures/invite.ts' import { INVITE } from '../types/endpoint.ts' import { ClientEvents } from '../gateway/ha...
<<<<<<< import cache from '../models/cache.ts' import { Channel } from "./channel.ts" import { MessageMentions } from "./MessageMentions.ts" import { TextChannel } from "./textChannel.ts" import { DMChannel } from "./dmChannel.ts" import { Guild } from "./guild.ts" ======= import { Channel } from './channel.ts' impor...
<<<<<<< ======= /* * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ import { IMsalContext } from "./MsalContext"; import { AuthenticationResult } from "@azure/msal-browser"; >>>>>>> /* * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under ...
<<<<<<< import type { DefaultProvider, TextTrackLike, MetadataEvent } from 'types/generic.type'; ======= import type { GenericObject, TextTrackLike, MetadataEvent } from 'types/generic.type'; import type { ProviderWithMixins } from './default'; >>>>>>> import type { TextTrackLike, MetadataEvent } from 'types/generic...
<<<<<<< import { Context, Env } from '../types'; ======= import { Context } from '../types'; import namedExports from 'named-exports-db'; >>>>>>> import { Context, Env } from '../types'; import namedExports from 'named-exports-db';
<<<<<<< if (this.updateQueue.length === 0) { this.updateTimer = setTimeout(() => this.applyUpdate()); ======= if (immediately) { this.updateQueue.push(update); this.applyUpdate(); } else { if (this.updateQueue.length === 0) { setTimeout(() => this.applyUpdate()); } ...
<<<<<<< .map((edge) => { const { source, target, shape, style } = edge; ======= .map(edge => { const { source, target, shape, style, type } = edge; >>>>>>> .map((edge) => { const { source, target, shape, style, type } = edge;
<<<<<<< import ConnectToArkane from "./arkane"; ======= import ConnectToAuthereum from "./authereum"; >>>>>>> import ConnectToArkane from "./arkane"; import ConnectToAuthereum from "./authereum"; <<<<<<< ConnectToSquarelink, ConnectToArkane ======= ConnectToSquarelink, ConnectToAuthereum >>>>>>> Connec...
<<<<<<< portis: { name: "@portis/web3", option: "portis", required: ["id"] }, walletconnect: { name: "@walletconnect/web3-provider", option: "walletconnect", required: ["infuraId"] }, arkane: { name: "@arkane-network/web3-arkane-provider", option: "arkane", required: ["clie...
<<<<<<< // @ts-ignore import TorusLogo from "../assets/torus.png"; ======= // @ts-ignore import AuthereumLogo from "../assets/authereum.svg"; >>>>>>> // @ts-ignore import TorusLogo from "../assets/torus.png"; // @ts-ignore import AuthereumLogo from "../assets/authereum.svg"; <<<<<<< arkane: { name: "@arkane-n...
<<<<<<< // @ts-ignore import DcentWalletLogo from "../logos/dcentwallet.png"; ======= // @ts-ignore import MEWwallet from "../logos/mewwallet.png" >>>>>>> // @ts-ignore import MEWwallet from "../logos/mewwallet.png" // @ts-ignore import DcentWalletLogo from "../logos/dcentwallet.png"; <<<<<<< }; export const DCEN...
<<<<<<< import * as Updater from "./updater/internal"; ======= import * as Tokens from "./tokens/internal"; >>>>>>> import * as Updater from "./updater/internal"; import * as Tokens from "./tokens/internal";
<<<<<<< import { QueryParamConfig, StringParam } from 'serialize-query-params'; import { getSSRSafeSearchString, usePreviousIfShallowEqual } from './helpers'; import { sharedMemoizedQueryParser } from './memoizedQueryParser'; import { useQueryParamContext } from './QueryParamProvider'; ======= import { parse as par...
<<<<<<< export function updateUrlQuery( queryReplacements: EncodedQuery, ======= export function getLocation( queryReplacements: EncodedQueryWithNulls, >>>>>>> export function getLocation( queryReplacements: EncodedQuery, <<<<<<< updateType: UrlUpdateType = 'pushIn' ======= location: Location, updateT...
<<<<<<< } function padZero(i: any) { if (i < 10) { i = "0" + i; } return i; } export function secondsToString(seconds:number):string{ var time = new Date(null); time.setHours(0); time.setMinutes(0); time.setSeconds(seconds); return padZero(time.getHours()) + ":" + padZero(time.getMinutes()) + ":" + padZero(...
<<<<<<< import { UrlString, StringUtils, Constants, TokenResponse, SPAClient } from "@azure/msal-common"; ======= import { UrlString, StringUtils, Constants, AuthorizationCodeModule } from "@azure/msal-common"; >>>>>>> import { UrlString, StringUtils, Constants, SPAClient } from "@azure/msal-common"; <<<<<<< *...
<<<<<<< alg?: Sequence; puzzle?: KPuzzleDefinition; visualization?: VisualizationFormat; ======= alg?: Sequence; puzzle?: KPuzzleDefinition; player?: { experimental3D?: boolean } >>>>>>> alg?: Sequence; puzzle?: KPuzzleDefinition; visualization?: VisualizationFormat; <<<<<<< this.ele...
<<<<<<< .toPromise() .then(candidates => addCandidatesInOrder(candidates, (candidate, isProject) => this._addSolution(candidate, isProject, { project }))); ======= .flatMap(candidates => { return Observable.fromArray(candidates.map(x ...
<<<<<<< cd.add(Observable.zip( Omni.listener.signatureHelp, Omni.listener.signatureHelp.skip(1), (current, previous) => ({ current, previous })) .subscribe(ctx => { var {current, previous} = ctx; if (!cu...
<<<<<<< Omni.getSolutionForProject(project).map(solution => ({ solution, project, filePath }))) .flatMap(({ solution, project, filePath }) => { ======= Omni.getClientForProject(project).map(client => ({ client, project, filePath }))) .where(x => !!x.client) ...
<<<<<<< constructor() {} ngOnInit() {} onFilterTextChange($event) { this.onFilterChange.emit($event); } ======= constructor(private cdr: ChangeDetectorRef) {} >>>>>>> constructor() {} ngOnInit() {} onFilterTextChange($event) { this.onFilterChange.emit($event); } constructor(private c...
<<<<<<< import { AccountInfo } from "../account/AccountInfo"; ======= import { IAccount } from "../account/IAccount"; import { BaseAuthRequest } from "./BaseAuthRequest"; >>>>>>> import { AccountInfo } from "../account/AccountInfo"; import { BaseAuthRequest } from "./BaseAuthRequest"; <<<<<<< export type SilentFlow...
<<<<<<< private processWhereArrayQry() { this._isArrayQry = true; var where_query = this._query.Where, ======= private processWhereArrayQry = function () { var is_first_where = true, original_onsuccess ...
<<<<<<< import {Component} from 'angular2/core'; import {Control, Validators, FormBuilder} from 'angular2/common'; ======= import { Component } from '@angular/core'; import { FormGroup, FormControl, Validators } from '@angular/forms'; >>>>>>> import { Component } from '@angular/core'; import { FormControl, Validator...
<<<<<<< semi: boolean; ======= useTabs: boolean; >>>>>>> semi: boolean; useTabs: boolean; <<<<<<< parser: parser, semi: config.semi ======= parser: parser, useTabs: config.useTabs, >>>>>>> parser: parser, semi: config.semi, useTabs: config.u...
<<<<<<< import { Barcode, GeoCoordinates, Thing, typeIsThing } from '../schema/core-schema-org.js'; import { ARArtifact, ARImageTarget, ARTargetTypes } from '../schema/extension-ar-artifacts.js'; ======= import { ARArtifact, ARTargetTypes } from '../schema/ar-artifact.js'; import { GeoCoordinates } from '../schema/ge...
<<<<<<< const url = new URL('/base/test-assets/test1.html', window.location.href); await meaningMaker.loadArtifactsFromUrl(url); ======= const url = new URL('/base/test-assets/test-barcode.html', window.location.href); const artifacts = await meaningMaker.loadArtifactsFromUrl(url); assert.lengthO...
<<<<<<< import { AngularFireDatabase } from 'angularfire2/database'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { LocalStorageService } from './local-storage.service'; ======= import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { LocalStorageService } from './local-storage.service'; //...
<<<<<<< ======= import {FunctionServer} from "./function-server"; import {SourceNameGenerator} from "../external/source-name-generator"; import {SpokesClient} from "../external/spokes"; >>>>>>> import {FunctionServer} from "./function-server"; <<<<<<< ======= if (this.proxyType === ProxyType.GOOGLE_CLOUD...
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query SaveArtworkQuery(\n $artworkID: String!\n) {\n artwork(id: $artworkID) {\n ...GridItem_artwork\n __id\n }\n}\n\nfragment GridItem_artwork on Artwork {\n ...
<<<<<<< v9 = { ======= v7 = { >>>>>>> v8 = { <<<<<<< v10 = { ======= v8 = { >>>>>>> v9 = { <<<<<<< v11 = { ======= v9 = { >>>>>>> v10 = { <<<<<<< v12 = { ======= v10 = { >>>>>>> v11 = { <<<<<<< v13 = { ======= v11 = { "kind": "ScalarField", "alias": null, "name": "name", "args": null, "stora...
<<<<<<< ======= v0, v1, >>>>>>> <<<<<<< (node as any).hash = 'f7bcb894a599e7defcff2d49e817acbb'; ======= (node as any).hash = '9e525e6757a5dead1392f313bc16d3b4'; >>>>>>> (node as any).hash = 'b8029530d6a6538ad36dfad5ee1c6542';
<<<<<<< ======= // #region Window Navigation /** * @hidden * Used to redirect the browser to the STS authorization endpoint * @param {string} urlNavigate - URL of the authorization endpoint */ static navigateWindow(urlNavigate: string): void { window.location.assign(urlNavigat...
<<<<<<< "text": "query PricingContextTestQuery(\n $enablePricingContext: Boolean!\n) {\n artwork(id: \"unused\") {\n ...PricingContext_artwork\n __id\n }\n}\n\nfragment PricingContext_artwork on Artwork {\n priceCents {\n min\n }\n artists {\n id\n __id\n }\n widthCm\n heightCm\n category\n ...
<<<<<<< v8 = { ======= v6 = { >>>>>>> v7 = { <<<<<<< v9 = { ======= v7 = { >>>>>>> v8 = { <<<<<<< v10 = { ======= v8 = { >>>>>>> v9 = { <<<<<<< v11 = { ======= v9 = { >>>>>>> v10 = { <<<<<<< v12 = { ======= v10 = { "kind": "ScalarField", "alias": null, "name": "name", "args": null, "storageK...
<<<<<<< v12 = [ v10, v4, ======= v11 = [ v9, v3, >>>>>>> v12 = [ v10, v3, <<<<<<< "text": "query routes_OfferQuery(\n $orderID: ID!\n) {\n order: commerceOrder(id: $orderID) {\n __typename\n ...Offer_order\n __id: id\n }\n}\n\nfragment Offer_order on CommerceOrder {\n id\n mode\n state\...
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query RelatedWorksArtworkGridQuery(\n $artworkSlug: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment R...
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query RelatedWorksArtworkGridRefetchQuery(\n $artworkSlug: String!\n $layerId: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork_hOS...
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query CollectionAppTestQuery {\n collection: marketingCollection(slug: \"kaws-companions\") {\n ...CollectionApp_collection\n __id: id\n }\n}\n\nfragment Collec...
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query ArtworkFilterArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\...
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query CollectArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\n _...
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query RelatedWorksArtworkGrid_Test_Query {\n artwork(id: \"david-hockney-early-morning-4\") {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment Rel...
<<<<<<< intent?: string onAppleLogin?: (e: Event) => void ======= intent: AuthIntent >>>>>>> intent: AuthIntent onAppleLogin?: (e: Event) => void
<<<<<<< import { ClientConfigurationError } from "./error/ClientConfigurationError"; import { AuthError } from "./error/AuthError"; import { ClientAuthError } from "./error/ClientAuthError"; ======= import { ClientConfigurationError } from "./error/ClientConfigurationError"; >>>>>>> import { ClientConfigurationErro...
<<<<<<< export const UPDATE_IT_STATEMENT = 'UPDATE_IT_STATEMENT' ======= export const ADD_COMPONENT_NAME = 'ADD_COMPONENT_NAME' export const CLEAR_FILE = 'CLEAR_FILE' export const DELETE_EXPECT = 'DELETE_EXPECT' export const REMOVE_FROM_IT = 'REMOVE_FROM_IT' >>>>>>> export const UPDATE_IT_STATEMENT = 'UPDATE_IT_STAT...
<<<<<<< its: {}, ======= keyOfExpect: 0, >>>>>>> keyOfExpect: 0, componentObj: {} <<<<<<< ======= >>>>>>> <<<<<<< ======= >>>>>>>
<<<<<<< item => expect(item.camera.shoulderModeScale).to.not.equal(undefined, 'camera.shoulderModeScale'), item => expect(Array.isArray(item.nextEvolutionBranches || [])).to.equal(true, "nextEvolutionBranches type"), item => expect(item.id !== 'BULBASAUR' || item.nextEvolutionBranche...
<<<<<<< uploadFile(file: File): void { const { fieldName, formId, s3UploadDir, renderer, uploads, uploadUrl } = this; const filename = file.name; const existingUploadIndex = this.findUpload(filename); if (existingUploadIndex !== null) { this.removeExistin...
<<<<<<< 'sort_by_title', 'sort_by_artist', 'custom_sort', ======= 'developed_by', >>>>>>> 'sort_by_title', 'sort_by_artist', 'custom_sort', 'developed_by', <<<<<<< sort_by_title: 'Sort by title', sort_by_artist: 'Sort by artist', custom_sort: 'Custom sort', ======= developed_by: 'D...
<<<<<<< import { AuthenticationResult, EventMessage, EventType, InteractionType } from '@azure/msal-browser'; ======= import { EventMessage, EventType, InteractionType, PopupRequest, RedirectRequest } from '@azure/msal-browser'; >>>>>>> import { AuthenticationResult, EventMessage, EventType, InteractionType, PopupRe...
<<<<<<< it("doesnt navigate if onRedirectNavigate returns false", (done) => { const logoutUriSpy = sinon.stub(AuthorizationCodeClient.prototype, "getLogoutUri").returns(testLogoutUrl); sinon.stub(BrowserUtils, "navigateWindow").callsFake((urlNavigate: string, timeout: number, logger: Lo...
<<<<<<< System.import('cyph/session/session').then(Session => { const session: ISession = new Session.Session( locals.descriptor, locals.nativeCrypto, null, locals.id ); session.on(locals.events.close, () => session.close() ); session.on(locals.events.receive, (e: { dat...
<<<<<<< /** * Logs WebSign failure (this one is super serious). * @function */ public static logWebSign = Errors.baseErrorLog('SOMEONE JUST GOT THE WEBSIGN ERROR SCREEN LADS', true); ======= >>>>>>>
<<<<<<< /** Gets filter function. */ public readonly getFilterFunction = memoize((incoming: boolean = false) => observableAll([this.currentDirectory, this.filterFunctionSubject]).pipe( map( ([currentDirectory, filterFunction]) => ( o: IAccountFileRecord ) => (filterFunction === undefined || fil...