conflict_resolution
stringlengths
27
16k
<<<<<<< }, { path: 'gridColumnGroups', component: GridColumnGroupsSampleComponent ======= }, { path: 'gridGroupBy', component: GridGroupBySampleComponent >>>>>>> }, { path: 'gridColumnGroups', component: GridColumnGroupsSampleComponent }, ...
<<<<<<< import { IgxInputModule } from "../directives/input/input.directive"; /** * **Ignite UI for Angular Date Picker** - [Documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/date_picker.html) * The Ignite UI Date Picker displays a popup calendar that lets users select a sing...
<<<<<<< } from "./grid.common"; import { IgxGridComponent } from "./grid.component"; import { IgxGridFilterConditionPipe, IgxGridFilteringPipe, IgxGridPagingPipe, IgxGridPostGroupingPipe, IgxGridPreGroupingPipe, IgxGridSortingPipe } from "./grid.pipes"; import { IgxGridGroupByRowComponent } from...
<<<<<<< } @Component({ template: `${GridTemplateStrings.declareGrid(`height="800px"`, '', ColumnDefinitions.multiColHeadersColumns)}` }) export class MultiColumnHeadersComponent extends BasicGridComponent { data = SampleTestData.contactInfoDataFull; ======= } @Component({ template: `${GridTemplateStrin...
<<<<<<< public tfootHeight: number; ======= public summariesHeight: number; public cellInEditMode: IgxGridCellComponent; >>>>>>> public summariesHeight: number;
<<<<<<< export interface IGroupingDoneEventArgs { ======= export interface IGridFocusChangeEventArgs extends IFocusChangeEventArgs { groupRow: IgxGridGroupByRowComponent; } export interface IGroupingDoneEventArgs extends IBaseEventArgs { >>>>>>> export interface IGroupingDoneEventArgs extends IBaseEventArgs {
<<<<<<< ======= const GRID_HEADER_CLASS = '.igx-grid__thead-wrapper'; const GRID_SCROLL_CLASS = '.igx-grid__scroll'; >>>>>>> <<<<<<< const SUMMARY_CELL = 'igx-grid-summary-cell'; export const GRID_SCROLL_CLASS = 'igx-grid__scroll'; export const GRID_MRL_BLOCK_CLASS = 'igx-grid__mrl-block'; export const CELL_PINNED_...
<<<<<<< import { verifyLayoutHeadersAreAligned, verifyDOMMatchesLayoutSettings } from '../../test-utils/helper-utils.spec'; ======= import { GridFunctions } from '../../test-utils/grid-functions.spec'; >>>>>>> import { verifyLayoutHeadersAreAligned, verifyDOMMatchesLayoutSettings } from '../../test-utils/helper-util...
<<<<<<< import { HttpRequest, RouteParameters, QueryParameters } from '../../http.interface'; ======= import { HttpRequest, RouteParameters, QueryParameters } from '../../http.interface'; >>>>>>> import { HttpRequest, QueryParameters, RouteParameters } from '../../http.interface'; <<<<<<< import { queryParams...
<<<<<<< @HostListener("contextmenu", ["$event"]) public onContextMenu(event) { this.grid.onContextMenu.emit({ cell: this, event }); } ======= @HostListener("click", ["$event"]) public onClick(event) { this.grid.onCellClick.emit({ cell: t...
<<<<<<< private checkIfGridIsAdded(node): boolean { if (node === this.nativeElement) { return true; } else { for (const childNode of node.childNodes) { const added = this.checkIfGridIsAdded(childNode); if (added) { return tr...
<<<<<<< import { AbstractControl, ControlValueAccessor, NgControl, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Subscription, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { DisplayDensityToken, IDisplayDensityOptions } from '../core/density'; import { EditorProvider } from '../core/e...
<<<<<<< export interface IBaseChipEventArgs { owner: IgxChipComponent; } export interface IChipClickEventArgs extends IBaseChipEventArgs { cancel: boolean; } export interface IChipKeyDownEventArgs extends IChipClickEventArgs { altKey: boolean; shiftKey: boolean; ctrlKey: boolean; key: string; ...
<<<<<<< get maxLevelHeaderDepth() { if (this._maxLevelHeaderDepth === null) { this._maxLevelHeaderDepth = this.columnList.reduce((acc, col) => Math.max(acc, col.level), 0); } return this._maxLevelHeaderDepth; } ======= get hiddenColumnsCount() { return this.co...
<<<<<<< <span igxButton routerLink="/dialog">Dialog</span> ======= <span igxButton routerLink="/progressbar">Progressbar</span> <span igxButton routerLink="/modal">Modal</span> >>>>>>> <span igxButton routerLink="/dialog">Dialog</span> <span igxButton route...
<<<<<<< import { ComboSampleComponent } from './combo/combo.sample'; ======= import { OverlaySampleComponent } from './overlay/overlay.sample'; >>>>>>> import { ComboSampleComponent } from './combo/combo.sample'; import { OverlaySampleComponent } from './overlay/overlay.sample';
<<<<<<< import { FilterPipe } from "../../src/list/filter-pipe"; ======= >>>>>>> <<<<<<< AvatarModule, ======= FilterModule, >>>>>>> AvatarModule, FilterModule,
<<<<<<< import { FilteringStrategy, IFilteringStrategy } from '../data-operations/filtering-strategy'; ======= import { IgxRowExpandedIndicatorDirective, IgxRowCollapsedIndicatorDirective, IgxHeaderExpandIndicatorDirective, IgxHeaderCollapseIndicatorDirective } from './grid/grid.directives'; import { GridKeydown...
<<<<<<< public pinRow(rowID, index?): boolean { if (this._pinnedRecordIDs.indexOf(rowID) !== -1) { ======= public pinRow(rowID: any, index?: number): boolean { const rec = this.gridAPI.get_rec_by_id(rowID); if (!rec || this.pinnedRecords.indexOf(rec) !== -1 || this.data.indexOf(rec) ==...
<<<<<<< import { TooltipSampleComponent } from './tooltip/tooltip.sample'; ======= import { ExpansionPanelSampleComponent } from './expansion-panel/expansion-panel-sample'; >>>>>>> import { TooltipSampleComponent } from './tooltip/tooltip.sample'; import { ExpansionPanelSampleComponent } from './expansion-panel/exp...
<<<<<<< ======= private get isFirstCell(): boolean { return this.columnIndex === 0 || (this.isPinned && this.visibleColumnIndex === 0); } private get isLastCell(): boolean { return this.columnIndex === this.grid.columns.length - 1 && !this.column.pinned; } >>>>>>> <<<<<<< priv...
<<<<<<< it('should not add hammer.js if it exists in angular.json build options', () => { ======= it('should not add hammer.js if it exists in angular.json', async () => { >>>>>>> it('should not add hammer.js if it exists in angular.json build options', async () => { <<<<<<< it('should add hammer.js to the ...
<<<<<<< import * as jsxc from './api/v1/index' ======= import * as jsxc from './api/v1' import Client from './Client'; >>>>>>> import * as jsxc from './api/v1/index' import Client from './Client';
<<<<<<< import { start } from '../../api/v1/index' ======= import { start } from '../../api/v1' import { usernameToJabberId } from '@src/FormWatcher'; >>>>>>> import { start } from '../../api/v1/index' import { usernameToJabberId } from '@src/FormWatcher';
<<<<<<< Workflow = "Workflow", ======= Commandline = "Commandline", >>>>>>> Workflow = "Workflow", Commandline = "Commandline",
<<<<<<< <workflow-settings :config="config" :translations="translations"></workflow-settings> ======= <commandline-settings :config="config" :translations="translations"></commandline-settings> >>>>>>> <workflow-settings :config="config" :translations="translations"></...
<<<<<<< import { defaultDictionaryOptions, DictionaryOptions } from "./dictionary-options"; ======= import { BrowserBookmarksOptions, defaultBrowserBookmarksOptions } from "./browser-bookmarks-options"; >>>>>>> import { defaultDictionaryOptions, DictionaryOptions } from "./dictionary-options"; import { BrowserBookma...
<<<<<<< import { workflowSettingsComponent } from "./settings/workflow-settings-component"; import { workflowEditingModal } from "./settings/modals/workflow-editing-modal-component"; ======= import { commandlineSettingsComponent } from "./settings/commandline-settings-component"; >>>>>>> import { workflowSettingsCom...
<<<<<<< Workflow = "Workflow", ======= Commandline = "Commandline", >>>>>>> Workflow = "Workflow", Commandline = "Commandline",
<<<<<<< import { FileHelpers } from "./helpers/file-helpers"; import { ueliTempFolder } from "../common/helpers/ueli-helpers"; if (!FileHelpers.fileExistsSync(ueliTempFolder)) { FileHelpers.createFolderSync(ueliTempFolder); } ======= import { getProductionTranslationManager } from "./production/production-transl...
<<<<<<< outputContainerHeight: (): string => { return `height: calc(100vh - ${Config.userInputHeight}px);`; }, searchResultExecutionArgumentStyle: (): string => { return `font-size: ${Config.searchResultExecutionArgumentFontSize}px;`; }, searchResultHeight...
<<<<<<< import { FirefoxBookmarkRepository } from "../plugins/browser-bookmarks-plugin/firefox-bookmark-repository"; ======= import { ChromiumBookmarkRepository } from "../plugins/browser-bookmarks-plugin/chromium-bookmark-repository"; >>>>>>> import { FirefoxBookmarkRepository } from "../plugins/browser-bookmarks-p...
<<<<<<< import { spanishTranslationSet } from "./spanish-translation-set"; ======= import { chineseTranslationSet } from "./chinese-translation-set"; >>>>>>> import { spanishTranslationSet } from "./spanish-translation-set"; import { chineseTranslationSet } from "./chinese-translation-set"; <<<<<<< case Lan...
<<<<<<< import { ProductionApplicationRepository } from "../plugins/application-search-plugin/production-application-repository"; import { defaultWindowsAppIcon, defaultMacOsAppIcon } from "../../common/icon/default-icons"; import { ApplicationIconService } from "../plugins/application-search-plugin/application-icon-se...
<<<<<<< workflows: "Workflows", workflowSettingsDescription: "This plugin enables you to quickly execute multiple things at once.", workflowSettingsAddWorkflow: "Add workflow", workflowName: "Name", workflowDescription: "Description", workflowTags: "Tags", workflowIcon: "Icon", workflowE...
<<<<<<< Dictionary = "dictionary", ======= BrowserBookmarks = "browser-bookmarks", >>>>>>> Dictionary = "dictionary", BrowserBookmarks = "browser-bookmarks",
<<<<<<< // console.log('test', __WORKER__); // 写入2个测试 cookie document.cookie = 'xsrf=alloy,token=worker'; /** worker url 会在构建时替换到 html 中的全局变量 * <script>window.__globalWorkerFilePath = 'WORKER_FILE_NAME_PLACEHOLDER'</script> * 'WORKER_FILE_NAME_PLACEHOLDER' -> 'alloy-worker-51497b48.js' */ const workerUrl: string =...
<<<<<<< import Cookie from './cookie'; ======= import WorkerReport from './worker-report'; >>>>>>> import WorkerReport from './worker-report'; import Cookie from './cookie'; <<<<<<< cookie: Cookie; ======= workerReport: WorkerReport; >>>>>>> workerReport: WorkerReport; cookie: Cookie; <<<<<<< ...
<<<<<<< messageTestHandler(payload: WorkerAbilityTestPayload.IMessageTest) { WorkerThreadWorker.cookie.getCookie(); ======= /** * 通信能力检测的处理器 */ private CommunicationTestHandler(payload: WorkerPayload.WorkerAbilityTest.ICommunicationTest) { >>>>>>> /** * 通信能力检测的处理器 */ p...
<<<<<<< import { SeverityTableRow } from '../components/Main/Scenario/ScenarioTypes' import { collectTotals, evolve, getPopulationParams, initializePopulation } from './model' import { AgeDistribution, AllParamsFlat, MitigationIntervals } from './types/Param.types' import { AlgorithmResult, SimulationTimePoint } from '...
<<<<<<< dryRun: false, outputPath:undefined, ======= dryRun: false, includes:[], excludes:[], prohibitPluginDirectives:false, >>>>>>> dryRun: false, outputPath:undefined, includes:[], excludes:[], prohibitPluginDirectives:false, ...
<<<<<<< hardenedRuntime?: boolean; ======= 'identity-validation'?: boolean; >>>>>>> hardenedRuntime?: boolean; 'identity-validation'?: boolean;
<<<<<<< const getContractsData = async ( reserve: string, user: string, testEnv: TestEnv, sender?: string ) => { ======= export const getContractsData = async (reserve: string, user: string, testEnv: TestEnv) => { >>>>>>> export const getContractsData = async ( reserve: string, user: string, testEnv: T...
<<<<<<< MockUniswapV2Router02Factory, ======= MockStableDebtTokenFactory, MockVariableDebtTokenFactory, >>>>>>> MockStableDebtTokenFactory, MockVariableDebtTokenFactory, MockUniswapV2Router02Factory, <<<<<<< ); export const getMockUniswapRouter = async (address?: tEthereumAddress) => await MockUnis...
<<<<<<< import {CommonsConfig} from '../config/commons'; const APPROVAL_AMOUNT_LENDING_POOL = CommonsConfig.ProtocolGlobalParams.ApprovalAmountLendingPoolCore; ======= import {parseEther} from 'ethers/lib/utils'; >>>>>>> import {CommonsConfig} from '../config/commons'; const APPROVAL_AMOUNT_LENDING_POOL = Comm...
<<<<<<< ======= if (match) { const query: Record<string, string | string[]> = Object.create(null); if (url.search.length > 0) { url.search.slice(1).split('&').forEach(searchParam => { let [, key, value = ''] = /([^=]*)(?:=(.*))?/.exec(decodeURIComponent(searchParam.replace(/\+/g, ' '))); if (typ...
<<<<<<< it('Swap liquidity', async () => { const {pool, dai, weth, users, configurator} = testEnv; const user = users[1]; // Pause the pool await configurator.setPoolPause(true); // Try to execute liquidation await expect( pool.connect(user.signer).swapLiquidity(user.address, dai.addre...
<<<<<<< deployMockUniswapRouter, deployUniswapLiquiditySwapAdapter, deployUniswapRepayAdapter, ======= deployWETHGateway, deployWETHMocked, >>>>>>> deployWETHGateway, deployWETHMocked, deployMockUniswapRouter, deployUniswapLiquiditySwapAdapter, deployUniswapRepayAdapter,
<<<<<<< UiPoolDataProvider = 'UiPoolDataProvider', ======= StableAndVariableTokensHelper = 'StableAndVariableTokensHelper', ATokensAndRatesHelper = 'ATokensAndRatesHelper', >>>>>>> StableAndVariableTokensHelper = 'StableAndVariableTokensHelper', ATokensAndRatesHelper = 'ATokensAndRatesHelper', UiPoolData...
<<<<<<< import { usingTenderly } from './tenderly-utils'; ======= import { addGas, totalGas } from '../gas-tracker'; >>>>>>> import { usingTenderly } from './tenderly-utils'; import { addGas, totalGas } from '../gas-tracker';
<<<<<<< // camera.context.matrix_p; helpMatrixB.copy(this.gameObject.transform.getWorldMatrix()).inverse(); Matrix.multiply(matrix, helpMatrixA, matrix); Matrix.multiply(matrix, helpMatrixB, matrix); // let viewMatrix = camera.calcViewMatrix(helpMatrixA); ...
<<<<<<< const mockUniswapRouter = await deployMockUniswapRouter(); await insertContractAddressInDb(eContractid.MockUniswapV2Router02, mockUniswapRouter.address); const UniswapLiquiditySwapAdapter = await deployUniswapLiquiditySwapAdapter([ addressesProvider.address, mockUniswapRouter.address, ]); awa...
<<<<<<< [0], ======= 0, _mockFlashLoanReceiver.address, >>>>>>> [0], _mockFlashLoanReceiver.address, <<<<<<< [0], ======= 0, _mockFlashLoanReceiver.address, >>>>>>> [0], _mockFlashLoanReceiver.address, <<<<<<< [0], ======= 0, ...
<<<<<<< export const getGenesisAaveAdmin = async (config: ICommonConfiguration) => { const currentNetwork = DRE.network.name; const targetAddress = getParamPerNetwork(config.AaveAdmin, <eEthereumNetwork>currentNetwork); ======= export const getGenesisPoolAdmin = async (config: ICommonConfiguration) => { const c...
<<<<<<< create_main_manifests({ routes, dev_port: this.dev_port }); ======= create_main_manifests({ bundler: this.bundler, routes, dev_port }); >>>>>>> create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port }); <<<<<<< create_main_manifests({ routes, dev_port: this.dev_port });...
<<<<<<< getPairsTokenAggregator, initReserves, ======= deployStableDebtToken, deployVariableDebtToken, deployGenericAToken, deployMockSwapAdapter, >>>>>>> getPairsTokenAggregator, initReserves, deployMockSwapAdapter,
<<<<<<< expect(callerDebt.toString()).to.be.equal('800720000000000000', 'Invalid user debt'); }); it('tries to take a very small flashloan, which would result in 0 fees (revert expected)', async () => { const {pool, weth, users} = testEnv; const caller = users[1]; await expect( pool.connect(...
<<<<<<< import {MockContract} from 'ethereum-waffle'; import {getReservesConfigByPool} from './configuration'; import {verifyContract} from './etherscan-verification'; import {cpuUsage} from 'process'; const { ProtocolGlobalParams: {UsdAddress}, } = CommonsConfig; export type MockTokenMap = {[symbol: string]: Mint...
<<<<<<< import {createBasicAuthClient} from "../__mocks__/base"; import { documentContent } from "../__mocks__/platforms/documentContent"; ======= import {createBasicAuthClient} from "../__mocks__/base"; >>>>>>> import {createBasicAuthClient} from "../__mocks__/base"; import { documentContent } from "../__mocks__/pl...
<<<<<<< ======= entryComponents: [DeleteAccountDialogComponent], providers: [Register, ActivateService, PasswordService, PasswordResetInitService, PasswordResetFinishService], >>>>>>> entryComponents: [DeleteAccountDialogComponent],
<<<<<<< this.sharedData.emit(this.data); this.gitService.getCompanies(gitProvider).subscribe( ======= this.data.gitCompanyListRefresh = true; this.gitConfigurationService.gitProviderService.getCompanies(gitProvider).subscribe( >>>>>>> this.data.gitCompanyListRefresh = true; ...
<<<<<<< it('/POST deployments/default should do a upsert if a module already exists and has new components ', async() => { const createDeploymentRequest = { deploymentId: '5ba3691b-d647-4a36-9f6d-c089f114e476', applicationName: 'c26fbf77-5da1-4420-8dfa-4dea235a9b1e', modules: [ { ...
<<<<<<< import { OctopipeApiService } from '../../../app/core/integrations/cd/octopipe/octopipe-api.service' import { CallbackTypeEnum } from '../../../app/api/notifications/enums/callback-type.enum' import { ModuleEntity } from '../../../app/api/modules/entity' ======= import { OctopipeApiService } from '../../../ap...
<<<<<<< import { CallbackTypeEnum } from '../../../app/api/notifications/enums/callback-type.enum' ======= import { ModuleEntity } from '../../../app/api/modules/entity' >>>>>>> import { CallbackTypeEnum } from '../../../app/api/notifications/enums/callback-type.enum' import { ModuleEntity } from '../../../app/api/m...
<<<<<<< requisiteStageRefIds: [`${stageId - 1}`], ======= requisiteStageRefIds: evalStageId ? [`${evalStageId}`] : [], >>>>>>> requisiteStageRefIds: evalStageId ? [`${evalStageId}`] : [`${stageId - 1}`],
<<<<<<< import { saveProfile, getProfile } from 'core/utils/profile'; import { isIDMEnabled } from 'core/utils/auth'; ======= import { isIDMAuthFlow } from 'core/utils/auth'; import { loadedWorkspacesAction } from 'modules/Workspaces/state/actions'; import { WorkspacePagination } from 'modules/Workspaces/interfaces/W...
<<<<<<< import { User, Profile, NewUser } from './interfaces/User'; import { logout } from 'core/utils/auth'; ======= import { User, Profile, NewUser, NewPassword } from './interfaces/User'; >>>>>>> import { User, Profile, NewUser, NewPassword } from './interfaces/User'; import { logout } from 'core/utils/auth';
<<<<<<< import { CallbackTypeEnum } from '../../../app/v1/api/notifications/enums/callback-type.enum' ======= import * as uuid from 'uuid' import { CdTypeEnum } from '../../../app/v1/api/configurations/enums' >>>>>>> import { CallbackTypeEnum } from '../../../app/v1/api/notifications/enums/callback-type.enum' import...
<<<<<<< it(`/POST /deployments in default circle should create deployment, module deployment and component deployment entities`, async () => { ======= it('/POST deployments/default should create deployment, module deployment and component deployment entities', async() => { >>>>>>> it('/POST /deployments in def...
<<<<<<< import { User, Profile, NewUser, NewPassword } from './interfaces/User'; import { isIDMEnabled } from 'core/utils/auth'; ======= import { User, NewUser, NewPassword } from './interfaces/User'; import { isIDMAuthFlow } from 'core/utils/auth'; >>>>>>> import { User, NewUser, NewPassword } from './interfaces/Us...
<<<<<<< export const radios: RadioButton[] = [ { icon: 'spinnaker', name: 'Octopipe', value: 'OCTOPIPE' }, ======= export const radios: Radio[] = [ { icon: 'charlescd', name: 'CharlesCD', value: 'OCTOPIPE' }, >>>>>>> export const radios: RadioButton[] = [ { icon: 'charlescd', name: 'CharlesCD', value: 'OCTOPIP...
<<<<<<< @UsePipes(DeploymentUniquenessPipe) @Post() public async createDeployment( @Body() createDeploymentRequestDto: CreateDeploymentRequestDto, @Headers('x-circle-id') incomingCircleId: string ======= @UsePipes(DeploymentUniquenessPipe, ComponentDeploymentUniquenessPipe) @Post('/circle') public...
<<<<<<< import { useFetch, FetchProps, useFetchData, FetchStatuses } from 'core/providers/base/hooks'; ======= import { useFetch, FetchProps, FetchStatuses, useFetchData } from 'core/providers/base/hooks'; >>>>>>> import { useFetch, FetchProps, FetchStatuses, useFetchData } from 'core/provide...
<<<<<<< import istioPipeline from './fixtures/expected-istio-pipeline' import { CallbackTypeEnum } from '../../../../app/v1/api/notifications/enums/callback-type.enum' ======= import istioPipeline, { istioPipelineHostValueAndGateway } from './fixtures/expected-istio-pipeline' >>>>>>> import { CallbackTypeEnum } from...
<<<<<<< const WarningPercentageContainer = styled.div` display: flex; flex-direction: row; margin-top: 15px; margin-bottom: 15px; > span { margin-left: 10px; } `; ======= const FieldErrorWrapper = styled.div` display: flex; margin-top: 2px; span { margin-left: 5px; margin-top: 2px; ...
<<<<<<< ======= next() { this.onClickNext(); } previous() { this.onClickPrevious(); } >>>>>>>
<<<<<<< import { MooveService } from '../../../app/core/integrations/moove' import { CallbackTypeEnum } from '../../../app/api/notifications/enums/callback-type.enum' import { ModuleDeploymentsRepository } from '../../../app/api/deployments/repository/module-deployments.repository' ======= import { MooveService } fro...
<<<<<<< /** * This interface was referenced by `WebpackOptions`'s JSON-Schema * via the `definition` "OptimizationSplitChunksGetCacheGroups". */ export type OptimizationSplitChunksGetCacheGroups = ( module: import("../lib/Module") ) => | OptimizationSplitChunksCacheGroup | OptimizationSplitChunksCacheGroup[] | v...
<<<<<<< cacheControl?: CacheControlExtensionOptions | boolean; ======= plugins?: []; >>>>>>> cacheControl?: CacheControlExtensionOptions | boolean; plugins?: [];
<<<<<<< // If request context's `metrics` already exists, preserve it, but _ensure_ it // exists there and shorthand it for use throughout this function. As of this // comment, the sole known case where `metrics` already exists is when the // `captureTraces` property is present and set to the result of the bool...
<<<<<<< import { Logger } from "apollo-server-types"; import { plugin as pluginCacheControl, CacheControlExtensionOptions, } from 'apollo-cache-control'; ======= import { Logger, SchemaHash } from "apollo-server-types"; import { getEngineApiKey, getEngineGraphVariant } from "apollo-engine-reporting/dist/agent"; ...
<<<<<<< * An expression which is used for base URI in runtime code. */ baseURI?: string; /** * The callback function name used by webpack for loading of chunks in WebWorkers. ======= * Add charset attribute for script tag. >>>>>>> * An expression which is used for base URI in runtime code. */ baseURI...
<<<<<<< it('applies the formatResponse function', () => { const app = createApp({apolloOptions: { schema: Schema, formatResponse(response) { response['extensions'] = { it: 'works' }; return response; }, }}); const expected = { it: 'works' }...
<<<<<<< resolverFactory: ResolverFactory; resolveDependencies(fs?: any, options?: any, callback?: any): any; ======= resolverFactory: any; resolveDependencies( fs: InputFileSystem, options: { mode: "sync" | "eager" | "weak" | "async-weak" | "lazy" | "lazy-once"; recursive: boolean; regExp: RegExp; ...
<<<<<<< it('should support custom template refs', () => { let source = ` @Component({ selector: 'foobar', template: '<form #todoForm="bar"><button [disabled]="!todoForm.form.valid"></button></form>' }) class Test { foo: number; }`; assertSu...
<<<<<<< import { ClusterName, RootState } from 'redux/interfaces'; ======= import Details from './Details'; import { ClusterName, RootState, TopicName } from 'redux/interfaces'; >>>>>>> import { ClusterName, RootState, TopicName } from 'redux/interfaces';
<<<<<<< import { fetchTopicList } from 'redux/actions'; ======= import { fetchTopicsList } from 'redux/actions'; import Topics from './Topics'; >>>>>>> import { fetchTopicsList } from 'redux/actions';
<<<<<<< underReplicatedPartitionCount: brokerSelectors.getUnderReplicatedPartitionCount(state) ======= inSyncReplicasCount: brokerSelectors.getInSyncReplicasCount(state), outOfSyncReplicasCount: brokerSelectors.getOutOfSyncReplicasCount(state), underReplicatedPartitionCount: brokerSelectors.getUnderReplicated...
<<<<<<< } // StructurePortal { const portals = room.find<StructurePortal>(FIND_STRUCTURES, {filter: (s) => s.structureType === STRUCTURE_PORTAL}); portals.forEach((p: StructurePortal) => { const state = p.ticksToDecay === undefined ? 'stable' : 'unstable'; if (p.destination instanceof RoomPosi...
<<<<<<< /** * Estimate the energy transaction cost of StructureTerminal.send and Market.deal methods. */ calcTransactionCost(amount: number, roomName1: string, roomName2: string): number; /** * Cancel a previously created order. The 5% fee is not returned. */ cancelOrder(orderId: str...
<<<<<<< OS: ${process.platform} `; const baseUrl: string = bugsUrl || `https://github.com/Microsoft/${extensionName}/issues`; const url: string = `${baseUrl}/new?body=${encodeURIComponent(body)}`; ======= OS: ${process.platform}`; if (parsedError.stack) { body = body.concat(` <details> <summar...
<<<<<<< describe('DOM tests:', () => { it('should display the correct number of items per page (10)', injectAsync([TestComponentBuilder], (tcb: TestComponentBuilder) => { return tcb.createAsync(TestCmp) .then((fixture: ComponentFixture) => { ...
<<<<<<< const TRANSACTION_TEMPLATE_ID_PLACEHOLDER: string = '{TRANSACTION_ID}'; export enum SupportedChains { Bitcoin = 'bitcoin', Ethmain = 'ethmain', Ethropst = 'ethropst', Ethrinkeby = 'ethrinkeby', Mocknet = 'mocknet', Regtest = 'regtest', Testnet = 'testnet' } export interface IBlockchainObject { ...
<<<<<<< const hasOwn = {}.hasOwnProperty; const classNames = (...args: any[]) => { const classes = []; let length = args.length; while (length--) { let arg = args[length]; if (!arg) continue; let argType = typeof arg; if (argType === 'string' || argType === 'number'...
<<<<<<< assert(!errors.length); ======= writeLogSync("validate-errors.md", errors); >>>>>>> writeLogSync("validate-errors.md", errors); <<<<<<< log.info(""); log.info(`Failed packages: ${JSON.stringify(failed)}`); ======= log.info(`These packages failed: ${failed}`); >>>>>>> log.info(""); log.info(`Thes...
<<<<<<< export async function readNotNeededPackages(options: Options): Promise<ReadonlyArray<NotNeededPackage>> { const raw = await readJson(notNeededPackagesPath(options)) as { packages: ReadonlyArray<NotNeededPackageRaw> }; return raw.packages.map(raw => new NotNeededPackage(raw)); } /** Path to the *root* for a g...
<<<<<<< this.error = null this.basketService.find(sessionStorage.getItem('bid')).subscribe((basket) => { ======= this.basketService.find(Number(sessionStorage.getItem('bid'))).subscribe((basket) => { >>>>>>> this.error = null this.basketService.find(Number(sessionStorage.getItem('bid'))).subscrib...
<<<<<<< import { OrderHistoryComponent } from './order-history/order-history.component' import { OrderHistoryService } from './Services/order-history.service' ======= import { DeliveryMethodComponent } from './delivery-method/delivery-method.component' import { DeliveryService } from './Services/delivery.service' >>...
<<<<<<< import { WalletComponent } from './wallet/wallet.component' import { WalletService } from './Services/wallet.service' ======= import { OrderHistoryComponent } from './order-history/order-history.component' import { OrderHistoryService } from './Services/order-history.service' import { DeliveryMethodComponent ...
<<<<<<< import { QuantityService } from '../Services/quantity.service' ======= import { Product } from '../Models/product.model' >>>>>>> import { Product } from '../Models/product.model' import { QuantityService } from '../Services/quantity.service' <<<<<<< let dialog let sanitizer let socketIoService let m...