conflict_resolution
stringlengths
27
16k
<<<<<<< import * as moment from 'jalali-moment'; ======= import * as momentNs from 'moment'; >>>>>>> import * as momentNs from 'jalali-moment';
<<<<<<< import {Moment} from 'jalali-moment'; ======= import {locale, Moment} from 'moment'; >>>>>>> import {locale, Moment} from 'jalali-moment';
<<<<<<< it('should check if min date validation is working', () => { page.minDateValidationPickerInput.clear(); expect(page.minDateValidationMsg.isPresent()).toBe(false); page.minDateValidationPickerInput.sendKeys('11-04-2017'); page.datePickerInput.sendKeys('10-04-2017'); expect(page.minDateVali...
<<<<<<< import * as moment from 'jalali-moment'; ======= import * as moment from 'moment'; import {Moment} from 'moment'; >>>>>>> import * as moment from 'jalali-moment'; import {Moment} from 'moment'; <<<<<<< import {ECalendarSystem} from '../common/types/calendar-type-enum'; ======= import {IDay} from './day.mo...
<<<<<<< import { Location } from "./location.model"; class PhoneNumber { value: string; confirmed: boolean; } ======= >>>>>>> import { Location } from "./location.model"; <<<<<<< yearOfBirth: number; ======= yearOfBirth: number; phoneNumberString: string; phoneNumbers: Array<string>; >...
<<<<<<< import { ProjectService, UtilityService } from './shared/services'; ======= import { Routes, RouterModule } from '@angular/router'; import { CoreModule } from './core/core.module'; >>>>>>> import { CoreModule } from './core/core.module'; <<<<<<< providers: [ ProjectService, UtilityServic...
<<<<<<< import { EndTraining } from '../Training/EndTraining'; import { BeginTraining } from '../Training/BeginTraining'; ======= import * as L from 'leaflet'; >>>>>>> import { EndTraining } from '../Training/EndTraining'; import { BeginTraining } from '../Training/BeginTraining'; import * as L from 'leaflet'; <<<<...
<<<<<<< import { PopTokenGenerator } from "../crypto/PopTokenGenerator"; ======= import { StringUtils } from "../utils/StringUtils"; import { RequestThumbprint } from "../network/RequestThumbprint"; import { NetworkResponse } from "../network/NetworkManager"; import { SilentFlowRequest } from "../request/SilentFlowRe...
<<<<<<< toBenchmark: true, timeout: 30000, ======= >>>>>>> timeout: 30000, <<<<<<< toBenchmark?: boolean timeout?: number ======= >>>>>>> timeout?: number
<<<<<<< setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) ======= setCoordinates({ start: e.startCoordinates, end: e.endCoordinates }) setKeyboardHeight(e.endCoordinates.height) >>>>>>> setCoordinates({start: e.startCoordinates, end: e.endCoordinates}) setKeyboardHeight(e.endCoor...
<<<<<<< import SearchBarIOS from './SearchBarIOS'; ======= import TabBarIOS from './TabBarIOS'; import TabBarItemIOS from './TabBarItemIOS'; >>>>>>> import SearchBarIOS from './SearchBarIOS'; import TabBarIOS from './TabBarIOS'; import TabBarItemIOS from './TabBarItemIOS'; <<<<<<< export { addNavigateHandlers, Scen...
<<<<<<< import 'babel-polyfill' jest.mock('../lib/sitemap-item') describe.skip('sitemap', () => { let sm ======= import 'babel-polyfill'; import { Sitemap, createSitemap, EnumChangefreq, EnumYesNo, ISitemapItemOptionsLoose, } from '../index'; import * as testUtil from './util'; jest.mock('../lib/sitemap...
<<<<<<< export interface SitemapNewsItem { ======= /** * https://support.google.com/webmasters/answer/74288?hl=en&ref_topic=4581190 */ export interface NewsItem { >>>>>>> /** * https://support.google.com/webmasters/answer/74288?hl=en&ref_topic=4581190 */ export interface SitemapNewsItem { <<<<<<< interface Site...
<<<<<<< ======= this.layers = [] this.layers.push(new Heatmap(this)) this.layers.push(new Cluster(this, () => { return this.roleMap.cluster.displayName; })) this.layers.push(new Circle(this, this.palette)) this.layers.push(new Cho...
<<<<<<< this.layers.map( layer => { layer.applySettings(settings, this.roleMap, this.colorMap); ======= this.layers.map(layer => { layer.applySettings(settings, this.roleMap); >>>>>>> this.layers.map(layer => { ...
<<<<<<< applySettings(settings: MapboxSettings, roleMap) { ======= applySettings(settings:MapboxSettings, roleMap: RoleMap) { >>>>>>> applySettings(settings:MapboxSettings, roleMap: RoleMap) { <<<<<<< let fillClassCount = mapboxUtils.getClassCount(fillColorLimits); ...
<<<<<<< ======= const layerVisibilityChanged = this.visibilityChanged(oldSettings, this.settings); >>>>>>> const layerVisibilityChanged = this.visibilityChanged(oldSettings, this.settings); <<<<<<< // If the map is loaded and style has not changed in this update ...
<<<<<<< private static ID = 'choropleth'; ======= private static ID = 'choropleth' private static OutlineID = 'choropleth-outline' >>>>>>> private static ID = 'choropleth' private static OutlineID = 'choropleth-outline' <<<<<<< if (existingStops[location]...
<<<<<<< function onUpdate(map, features, settings, zoom, category, updatedHandler: Function) { try { if (!map.getSource('data')) { return; } ======= return colors; } function onUpdate(map, features, settings, zoom, category, host) { if (!map...
<<<<<<< public apiUrl: string = "https://api.mapbox.com" ======= public geocoder: boolean = true; >>>>>>> public apiUrl: string = "https://api.mapbox.com" public geocoder: boolean = true;
<<<<<<< @Input() opens: string; @Input() drops: string; ======= @Input() firstMonthDayClass: string; @Input() lastMonthDayClass: string; @Input() emptyWeekRowClass: string; @Input() firstDayOfNextMonthClass: string; @Input() lastDayOfPreviousMonthClass: string; >>>>>>> @Input() open...
<<<<<<< const onMouseEvent = (e: MouseEvent) => { for (let key in this.instances) { const connection: DeviceConnection = this.instances[key]; ======= const supportsPassive = Util.supportsPassive(); const onMouseEvent = (e: MouseEvent | TouchEvent...
<<<<<<< ======= const bindingDBStack = new BindingDBStack(app, "BindingDbStack", { database: baseline.Baseline_BindingDB.BindingDBDatabaseInstance, accessSecurityGroup: baseline.Baseline_BindingDB.DbAccessSg, databaseSecret: baseline.Baseline_BindingDB.DbSecret, DataLake: coreDataLake }); >>>>>>>
<<<<<<< case 'persistState': if (tabId) { chrome.extension .getBackgroundPage() .window.console.log('message received in background'); // if msg tabId provided, send persistState command to content-script chrome.tabs.sendMessage(Number(tabId), msg); ...
<<<<<<< case 'persistState': window.postMessage(msg, '*'); break; ======= case 'throttleEdit': window.postMessage(msg, '*'); break; >>>>>>> case 'persistState': window.postMessage(msg, '*'); break; case 'throttleEdit': window.postMessage(msg, '*'); bre...
<<<<<<< export { Configuration } from "./config/Configuration"; export { InteractionType, BrowserCacheLocation, WrapperSKU } from "./utils/BrowserConstants"; ======= export { Configuration, BrowserAuthOptions, CacheOptions, BrowserSystemOptions } from "./config/Configuration"; export { InteractionType, BrowserCacheLo...
<<<<<<< import { binding, given, when, then } from "cucumber-tsflow"; import Callback = cucumber.CallbackStepDefinition; ======= import { binding, given, when, then } from 'cucumber-tsflow'; import { CallbackStepDefinition } from 'cucumber'; >>>>>>> import { binding, given, when, then } from "cucumber-tsflow"; impor...
<<<<<<< // Simple check for whether our target app uses Recoil if (window[`$recoilDebugStates`]) { isRecoil = true; } ======= if ( memoizedState && (tag === 0 || tag === 1 || tag === 2 || tag === 10) && isRecoil === true ) { if (memoizedState.queue) { // Hooks states ...
<<<<<<< let fiberRoot = null; ======= let isRecoil = false; >>>>>>> let fiberRoot = null; let isRecoil = false; <<<<<<< /** * @method sendSnapshot * @param snap The current snapshot * @param mode The current mode (i.e. jumping, time-traveling, locked, or paused) * @return Nothing. * * Middleware: Gets a copy ...
<<<<<<< //console.log('MEMOIZED PROPS ------>', memoizedProps); // console.log('MEMOIZEDSTATE QUEUE------>', memoizedState.queue); // console.log('HOOK STATE ------->', hooksStates); ======= >>>>>>> <<<<<<< //console.log('1st ATOM ARRAY', atomArray); ======= // console.log('1st AT...
<<<<<<< migrations: [InitMigration1558328532490], } ======= migrations: [InitMigration1558328532490, AddSince1558491231870], }) return connectionOptions >>>>>>> migrations: [InitMigration1558328532490, AddSince1558491231870], }
<<<<<<< import SignMessageController from 'controllers/sign-message' ======= import CustomizedAssetsController from './customized-assets' >>>>>>> import SignMessageController from 'controllers/sign-message' import CustomizedAssetsController from './customized-assets' <<<<<<< private signAndVerifyController = new ...
<<<<<<< import SkipDataAndType from './settings/skip-data-and-type' import FeeMode from 'models/fee-mode' ======= >>>>>>> import FeeMode from 'models/fee-mode'
<<<<<<< import { AddTypeHashToOutput1572852964749 } from './migrations/1572852964749-AddTypeHashToOutput' import { AddDepositOutPointToOutput1573305225465 } from './migrations/1573305225465-AddDepositOutPointToOutput' ======= import { AddInputIndexToInput1573461100330 } from './migrations/1573461100330-AddInputIndexT...
<<<<<<< | 'migrate-acp' // Hardware Wallet | 'detect-device' | 'get-device-ckb-app-version' | 'get-device-firmware-version' | 'get-device-public-key' | 'connect-device' | 'create-hardware-wallet' // offline-signature | 'export-transaction-as-json' | 'sign-transaction-only' | 'broadcast-transacti...
<<<<<<< import { createWallet, importWallet, exportWallet, setNetwork, sendCapacity, TransferItem, } from '../../services/UILayer' import { Network } from '../../contexts/Chain' import { defaultNetworks } from '../../contexts/Settings' import { saveNetworks, loadNetworks } from '../../utils/localStorage' im...
<<<<<<< import i18n from '../utils/i18n' import { verifyPasswordComplexity } from '../utils/validators' ======= import { Keychain } from './hd' >>>>>>> import i18n from '../utils/i18n' import { verifyPasswordComplexity } from '../utils/validators' import { Keychain } from './hd'
<<<<<<< import RpcService from 'services/rpc-service' import SyncedBlockNumber from 'models/synced-block-number' import SyncStateSubject from 'models/subjects/sync-state-subject' import NodeService from 'services/node' import Method from '@nervosnetwork/ckb-sdk-rpc/lib/method' import { CurrentNetworkIDSubject } from 'm...
<<<<<<< absences(period?: String): Promise<Absences> infos(period?: String): Promise<Infos> ======= homeworks(from?: Date, to?: Date): Promise<Array<Homework>> >>>>>>> absences(period?: String): Promise<Absences> infos(period?: String): Promise<Infos> homeworks(from?: Date, to?: Date): Promis...
<<<<<<< } /* * @example * * given: lazy-page/en => lazy-page * */ export function getScopeFromLang(lang: string): string { const split = lang.split('/'); split.pop(); return split.join('/'); } /* * @example * * given: lazy-page/en => en * */ export function getLangFromScope(lang: string): string { c...
<<<<<<< import { ProductsCacheService } from '../shared/products-cache.service'; ======= import { PagerService } from '../../core/pager/pager.service'; >>>>>>> import { ProductsCacheService } from '../shared/products-cache.service'; import { PagerService } from '../../core/pager/pager.service'; <<<<<<< constructo...
<<<<<<< BrowserAnimationsModule, ======= CoreModule.forRoot(), >>>>>>> BrowserAnimationsModule, CoreModule.forRoot(),
<<<<<<< import { AdminGuard } from './admin.guard'; ======= import { CheckoutComponent } from './checkout/checkout.component'; >>>>>>> import { AdminGuard } from './admin.guard'; import { CheckoutComponent } from './checkout/checkout.component'; <<<<<<< { path: 'admin/add', component: AddEditComponent, canActivat...
<<<<<<< import { AddEditComponent } from './add-edit/add-edit.component'; ======= import { CheckoutComponent } from './checkout/checkout.component'; import { AddressComponent as CheckoutAddressComponent } from './checkout/address/address.component'; import { ShippingComponent as CheckoutShippingComponent } from './ch...
<<<<<<< import { PagerService } from '../../pager/pager.service'; import { SortPipe } from '../../sort.pipe'; ======= import { ProductsCacheService } from '../shared/products-cache.service'; import { PagerService } from '../../core/pager/pager.service'; >>>>>>> import { PagerService } from '../../pager/pager.service...
<<<<<<< import { Data, SetupFunction } from './component' import { currentVue } from './runtimeContext' ======= import { Data, SetupFunction, SetupContext } from './component' >>>>>>> import { Data, SetupFunction } from './component' <<<<<<< export default plugin export { createElement as h } from './createElement'...
<<<<<<< const keyType = 'str'; const expReturn = { data: '12345' }; ======= const keyType = "str"; const expReturn = { data: "12345" }; const reverse = false; const showPayer = false; >>>>>>> const keyType = 'str'; const expReturn = { data: '12345' }; ...
<<<<<<< // Validate cache location and initialize storage if (!this.cacheLocations[this.pConfig.cache.cacheLocation]) { throw MSALError.ConfigurationError.createInvalidCacheLocationConfigError( this.pConfig.cache.cacheLocation, "unavailable", config.auth.state ); ...
<<<<<<< Rounds: Array<Models.Round>; Positions: Array<string>; PlayerStats: Array<Models.PlayerStats>; private _countdown: number; get Countdown(): number { return this._countdown; } set Countdown(value: number) { this._countdown = value; ...
<<<<<<< import * as Enums from "../../enums"; ======= import * as Objects from "../.."; >>>>>>> import * as Enums from "../../enums"; import * as Objects from "../.."; <<<<<<< en: Enums.TestImport_Enum; optEnum: Nullable<Enums.TestImport_Enum>; enumArray: Array<Enums.TestImport_Enum>; optEnumArray: Array<Nu...
<<<<<<< import { Uri } from "../"; import { buildAndDeployApi, testEnvUp, testEnvDown } from "./helpers"; ======= import { Web3ApiClient, UriRedirect } from "../"; import { buildAndDeployApi, initTestEnvironment, stopTestEnvironment } from "@web3api/test-env-js"; >>>>>>> import { createWeb3ApiClient } from ...
<<<<<<< import * as Enums from "../enums"; ======= import * as Objects from ".."; >>>>>>> import * as Enums from "../enums"; import * as Objects from ".."; <<<<<<< var _str: string = ""; var _strSet: boolean = false; var _optStr: string | null = null; var _en: Enums.CustomEnum = 0; var _enSet: boolean = f...
<<<<<<< .command("add", "Create a new access key associated with your account", (yargs: yargs.Argv) => accessKeyAdd("add", yargs)) .command("list", "List the access keys associated with your account", (yargs: yargs.Argv) => accessKeyList("list", yargs)) .command("ls", "List the acces...
<<<<<<< import { AcquisitionStatus } from "code-push/script/acquisition-sdk"; import { AccessKey, Account, AccountManager, App, CollaboratorMap, CollaboratorProperties, Deployment, DeploymentMetrics, Package, PackageInfo, Permissions, UpdateMetrics } from "code-push"; ======= import { AccessKey, Account, App, Collabo...
<<<<<<< interface ILegacyLoginConnectionInfo { ======= const ACTIVE_METRICS_KEY: string = "Active"; const DOWNLOADED_METRICS_KEY: string = "Downloaded"; interface IStandardLoginConnectionInfo { >>>>>>> const ACTIVE_METRICS_KEY: string = "Active"; const DOWNLOADED_METRICS_KEY: string = "Downloaded"; interface ILega...
<<<<<<< import {CMakeServerClient, ProgressMessage, MessageMessage, HelloMessage, HandshakeMessage, ConfigureMessage, createCooke, CMakeCacheEntry, GlobalSettings, CodeModelMessage, CodeModelTarget, CodeModelConfiguration } ...
<<<<<<< 'use strict'; import * as proc from 'child_process'; import * as fs from 'fs'; export function doAsync<T>(fn: Function, ...args: any[]): Promise<T> { return new Promise<T>((resolve, reject) => { fn(...args, resolve); }); } export function exists(filepath: string): Promise<boolean> { retur...
<<<<<<< private _extCacheContent: ExtCache; private _extCachePath = path.join(vscode.workspace.rootPath, '.vscode', '.cmaketools.json'); ======= private _targets: string[]; >>>>>>> private _extCacheContent: ExtCache; private _extCachePath = path.join(vscode.workspace.rootPath, '.vscode', '.cmaket...
<<<<<<< * Platform arguments for VS Generators. * Currently, there is a mismatch only between x86 and win32. * For example, VS kits x86 and amd64_x86 will generate -A win32 ======= * Gets the environment variables set by a shell script. * @param kit The kit to get the environment variables for */ export async f...
<<<<<<< log.debug(localize('disposing.extension', 'Disposing CMakeTools extension')); ======= log.debug('Disposing CMakeTools extension'); telemetry.deactivate(); >>>>>>> log.debug(localize('disposing.extension', 'Disposing CMakeTools extension')); telemetry.deactivate(); <<<<<<< private getPr...
<<<<<<< async acquireToken(request: AuthorizationCodeRequest, authCodePayload?: AuthorizationCodePayload): Promise<AuthenticationResult> { ======= async acquireToken(request: AuthorizationCodeRequest, cachedNonce?: string, cachedState?: string): Promise<AuthenticationResult | null> { >>>>>>> async acquir...
<<<<<<< import {TreeModule} from 'angular-tree-component'; import {EventSchemaPreviewComponent} from './schema-editor/event-schema-preview/event-schema-preview.component'; import {EventPropertyRowComponent} from "./schema-editor/event-property-row/event-property-row.component"; import {PropertySelectorService} from ".....
<<<<<<< // Generated using typescript-generator version 2.24.612 on 2020-09-20 21:03:26. ======= // Generated using typescript-generator version 2.27.744 on 2021-01-19 20:45:10. >>>>>>> // Generated using typescript-generator version 2.27.744 on 2021-01-19 20:45:10. <<<<<<< export class PipelineElementTopicInfo { ...
<<<<<<< import { PipelineLogsComponent } from '../pipeline-logs/pipeline-logs.component'; ======= import {NewComponent} from '../connect/new/new.component'; >>>>>>> import {PipelineLogsComponent} from '../pipeline-logs/pipeline-logs.component'; import {NewComponent} from '../connect/new/new.component'; <<<<<<< ...
<<<<<<< isPublished: data.isPublished, name: data.name, publicationDate: data.publicationDate !== "" ? data.publicationDate : null, seo: { description: data.seoDescription, title: data.seoTitle }, slug: data.slug, visibleInListings: data.visibleInListing...
<<<<<<< import {BBox} from '../../../util/BBox.js'; import {StyleList} from '../../common/CssStyles.js'; ======= import {BBox} from '../BBox.js'; import {StyleList} from '../../../util/StyleList.js'; >>>>>>> import {BBox} from '../../../util/BBox.js'; import {StyleList} from '../../../util/StyleList.js';
<<<<<<< const responseScopes = ScopeSet.fromString(serverTokenResponse.scope, this.clientId); UnifiedCacheManager.saveCacheRecord(this.cacheStorage, cacheRecord, this.clientId, responseScopes); ======= const responseScopes = ScopeSet.fromString(serverTokenResponse.scope); this.uCacheMa...
<<<<<<< import {StyleList as CssStyleList} from './common/CssStyles.js'; ======= import {FontCache} from './svg/FontCache.js'; >>>>>>> import {StyleList as CssStyleList} from './common/CssStyles.js'; import {FontCache} from './svg/FontCache.js'; <<<<<<< * The default styles for SVG */ public static c...
<<<<<<< align: 'top', // placement of magnified expression backgroundColor: 'Blue', // color for background of selected sub-expression backgroundOpacity: .2, // opacity for background of selected sub-expression br...
<<<<<<< import { CacheRecord } from "../cache/entities/CacheRecord"; import { IdTokenEntity } from "../cache/entities/IdTokenEntity"; import { CacheHelper } from "../cache/utils/CacheHelper"; import { AccessTokenEntity } from "../cache/entities/AccessTokenEntity"; import { RefreshTokenEntity } from "../cache/entities/R...
<<<<<<< import {BBox} from '../../../util/BBox.js'; import {StyleList} from '../../common/CssStyles.js'; ======= import {BBox} from '../BBox.js'; import {StyleList} from '../../../util/StyleList.js'; >>>>>>> import {BBox} from '../../../util/BBox.js'; import {StyleList} from '../../../util/StyleList.js';
<<<<<<< import {MmlNode, TextNode, AbstractMmlNode, AttributeList} from '../../core/MmlTree/MmlNode.js'; import {MmlMo} from '../../core/MmlTree/MmlNodes/mo.js'; ======= import {MmlNode, TextNode, AbstractMmlNode, AttributeList, indentAttributes} from '../../core/MmlTree/MmlNode.js'; >>>>>>> import {MmlNode, TextNod...
<<<<<<< rSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parseFloat(fSpace[1] || '0'); this.bbox.h = h / 2 + a; this.bbox.d = h / 2 - a; this.bbox.w = W.concat(cLines).reduce((a, b) => a + b) + cSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parse...
<<<<<<< import { Constants, SSOTypes, PromptState, BlacklistedEQParams, InteractionType } from "./Constants"; ======= import { Constants, SSOTypes, PromptState, BlacklistedEQParams, InteractionErrorType } from "./Constants"; >>>>>>> import { Constants, SSOTypes, PromptState, BlacklistedEQParams, InteractionType } fr...
<<<<<<< import { IPublicClientApplication } from "./IPublicClientApplication"; ======= import { DeviceCodeRequest } from "../request/DeviceCodeRequest"; import { UsernamePasswordRequest } from "../request/UsernamePasswordRequest"; >>>>>>> import { IPublicClientApplication } from "./IPublicClientApplication"; import ...
<<<<<<< import {CHTMLmaction} from './Wrappers/maction.js'; ======= import {CHTMLmglyph} from './Wrappers/mglyph.js'; >>>>>>> import {CHTMLmaction} from './Wrappers/maction.js'; import {CHTMLmglyph} from './Wrappers/mglyph.js'; <<<<<<< [CHTMLmaction.kind]: CHTMLmaction, ======= [CHTMLmglyph.kind]: CHTMLmg...
<<<<<<< * Variant locations in the Math Alphabnumerics block: * [upper-alpha, lower-alpha, upper-Greek, lower-Greek, numbers] */ public static VariantSmp: {[name: string]: SmpData} = { bold: [0x1D400, 0x1D41A, 0x1D6A8, 0x1D6C2, 0x1D7CE], italic: [0x1D434, 0x1D44E, 0x1D6E2, 0x1D6FC], ...
<<<<<<< import { B2cAuthority } from "../authority/B2cAuthority"; ======= import { UnifiedCacheManager } from "../unifiedCache/UnifiedCacheManager"; >>>>>>> import { B2cAuthority } from "../authority/B2cAuthority"; import { UnifiedCacheManager } from "../unifiedCache/UnifiedCacheManager";
<<<<<<< rSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parseFloat(fSpace[1]); bbox.h = h / 2 + a; bbox.d = h / 2 - a; bbox.w = W.concat(cLines).reduce((a, b) => a + b) + cSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parseFloat(fSpace[1]); ===...
<<<<<<< const expr = document.getText(Range.create(startPosition, position)); if (!expr.trim().endsWith('=')) { ======= const text = document.getText(Range.create(startPosition, position)); if (!text.trimRight().endsWith('=')) { >>>>>>> const expr = document.getText(Range.create(startPosition, po...
<<<<<<< @Component({ selector: 'inline-editor', template: `<div> <div id="inlineEditWrapper"> <a [ngClass]="{'editable-empty': isEmpty }" (click)="edit(value)" [hidden]="editing && !disabled">{{ showText() }}</a> <div class="inlineEditForm form-inline" [h...
<<<<<<< menuToggle?: boolean | string; ======= jsonSampleExpandLevel?: number | string | 'all'; >>>>>>> menuToggle?: boolean | string; jsonSampleExpandLevel?: number | string | 'all'; <<<<<<< menuToggle: boolean; ======= jsonSampleExpandLevel: number; enumSkipQuotes: boolean; >>>>>>> menuToggle: ...
<<<<<<< isInitial: boolean; ======= >>>>>>> isInitial: boolean;
<<<<<<< // Initialize authority or use default, and perform discovery endpoint check. const acquireTokenAuthority = (request && request.authority) ? AuthorityFactory.createInstance(request.authority, this.networkClient) : this.defaultAuthorityInstance; if (!acquireTokenAuthority.disc...
<<<<<<< import { Datasource } from "api/DatasourcesApi"; import { Plugin } from "api/PluginApi"; import { PLUGIN_PACKAGE_DBS } from "constants/QueryEditorConstants"; ======= import { RestAction } from "entities/Action"; import { isDynamicValue } from "utils/DynamicBindingUtils"; >>>>>>> import { Datasource } from "a...
<<<<<<< import { UserAgentApplication } from "../src/index"; import { Constants, ErrorCodes, ErrorDescription } from "../src/Constants"; import { Authority } from "../src/Authority"; import { AuthenticationRequestParameters } from "../src/AuthenticationRequestParameters"; import { AuthorityFactory } from "../src/Author...
<<<<<<< import broidSchemas from "broid-schemas"; import { Logger } from "broid-utils"; import { EventEmitter } from "events"; import { Router } from "express"; ======= import broidSchemas from "@broid/schemas"; import { Logger } from "@broid/utils"; >>>>>>> import broidSchemas from "@broid/schemas"; import { Logger...
<<<<<<< protected async _overrideDeployTransactionConfig(deployTransaction: UnsignedTransaction): Promise<UnsignedTransaction> { ======= private async _overrideDeployTransactionConfig(deployTransaction: utils.UnsignedTransaction): Promise<utils.UnsignedTransaction> { >>>>>>> protected async _overrideDeployTran...
<<<<<<< Chanel: undefined; ======= Chrome: undefined; Snapchat: undefined; Reflectly: undefined; >>>>>>> Chanel: undefined; Chrome: undefined; Snapchat: undefined; Reflectly: undefined;
<<<<<<< const cacheRecord = new CacheRecord(); cacheRecord.account = UnifiedCacheManager.getAccount(this.cacheStorage, CacheHelper.generateAccountCacheKey(request.account)); ======= const cachedAccount = this.unifiedCacheManager.getAccount(CacheHelper.generateAccountCacheKey(request.account));...
<<<<<<< private _digestCache: DigestCache; public fetch(url: string, options: FetchOptions = {}): Promise<Response> { ======= public fetch(url: string, options: any = {}): Promise<Response> { >>>>>>> public fetch(url: string, options: FetchOptions = {}): Promise<Response> {
<<<<<<< class MyItem extends Item { public Title: string; public Value: string; } export const thing = function (show: (s) => void) { sp.web.lists.getByTitle("Config3").get().then((g) => show(g.Title)); sp.web.lists.getByTitle("Config3").get().then((g: any) => show(g.Title)); sp.web.lists.g...
<<<<<<< ======= /** * Gets or sets a description of the content type. */ public get description(): Queryable { return new Queryable(this, "description"); } /** * Gets or sets a value that specifies the name of a custom display form template * to use for list items that h...
<<<<<<< !!isOptimized && rollupPluginTerser(), ], onwarn: ((warning, warn) => { if (warning.code === 'UNRESOLVED_IMPORT') { logError(`'${warning.source}' is imported by '${warning.importer}', but could not be resolved.`); if (isNodeBuiltin(warning.source)) { c...
<<<<<<< import {NotificationEnum, SuggestedActionTypeEnum} from 'parabol-client/types/graphql' import {SubscriptionChannel} from 'parabol-client/types/constEnums' ======= import sendSegmentEvent from '../../utils/sendSegmentEvent' >>>>>>> import {NotificationEnum, SuggestedActionTypeEnum} from 'parabol-client/types/...
<<<<<<< const makeRetroTemplates = (teamId: string, orgId: string, templateObj: TemplateObject) => { const phaseItems: RetrospectivePrompt[] = [] ======= const makeRetroTemplates = (teamId: string, templateObj = templateBase) => { const reflectPrompts: RetrospectivePrompt[] = [] >>>>>>> const makeRetroTemplates ...
<<<<<<< import { B2cAuthority } from "../authority/B2cAuthority"; import { AuthorizationUrlRequest } from "../request/AuthorizationUrlRequest"; import { RequestParameterBuilder } from "../server/RequestParameterBuilder"; import { AuthorizationCodeRequest } from "../request/AuthorizationCodeRequest"; import { RefreshTok...
<<<<<<< UpdatePokerTemplateDimensionScalePayload, UpdatePokerTemplateScaleValuePayload, UpdateUserProfilePayload ======= UpdateUserProfilePayload, PersistJiraSearchQuerySuccess >>>>>>> UpdatePokerTemplateDimensionScalePayload, UpdatePokerTemplateScaleValuePayload, UpdateUserProfilePayload, PersistJ...
<<<<<<< import dragEstimatingTask from './mutations/dragEstimatingTask' ======= import editCommenting from './mutations/editCommenting' >>>>>>> import dragEstimatingTask from './mutations/dragEstimatingTask' import editCommenting from './mutations/editCommenting' <<<<<<< endDraggingReflection, endSprintPoke...
<<<<<<< /** * Move a scale value to an index */ movePokerTemplateScaleValue: MovePokerTemplateScaleValuePayload; ======= /** * Set the jira field that the poker dimension should map to */ updateJiraDimensionField: UpdateJiraDimensionFieldPayload; >>>>>>> /** * Move a scale value to an ind...