conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import {RETRO_PHASE_ITEM} from 'parabol-client/utils/constants'
import getRethink from '../../database/rethinkDriver'
import db from '../../db'
import getTemplateScore from '../../utils/getTemplateScore'
=======
>>>>>>>
import getRethink from '../../database/rethinkDriver'
import db from '../../db'
import ge... |
<<<<<<<
=======
const {reflectPrompts, templates} = makeRetroTemplates(teamId, base)
await r({
newTemplate: r.table('ReflectTemplate').insert(templates),
newReflectPrompt: r.table('ReflectPrompt').insert(reflectPrompts)
}).run()
const templateId = templates[0].id
const data = {templa... |
<<<<<<<
import {RenameMeetingSuccess} from './RenameMeetingPayload'
=======
import {AddReactjiToReflectionSuccess} from './AddReactjiToReflectionPayload'
>>>>>>>
import {RenameMeetingSuccess} from './RenameMeetingPayload'
import {AddReactjiToReflectionSuccess} from './AddReactjiToReflectionPayload' |
<<<<<<<
import VoteForReflectionGroupPayload from './VoteForReflectionGroupPayload'
=======
import {FlagReadyToAdvanceSuccess} from './FlagReadyToAdvancePayload'
import EditCommentingPayload from './EditCommentingPayload'
>>>>>>>
import EditCommentingPayload from './EditCommentingPayload'
import VoteForReflectionGro... |
<<<<<<<
=======
return createEmailVerification(args)
}
const hashedPassword = await bcrypt.hash(password, Security.SALT_ROUNDS)
const newUser = createNewLocalUser({email, hashedPassword, isEmailVerified: false, segmentId})
// MUTATIVE
context.authToken = await bootstrapNewUser(newUser, isOrg... |
<<<<<<<
import generateUID from '../../generateUID'
=======
>>>>>>>
import generateUID from '../../generateUID'
<<<<<<<
const {id, domain, cert, url, metadata} = input
this.id = id || generateUID()
this.domain = domain
this.cert = cert
=======
const {id, domains, url, metadata} = input
t... |
<<<<<<<
import {MeetingTypeEnum} from 'parabol-client/types/graphql'
=======
import {SharingScopeEnum} from '../../client/types/graphql'
>>>>>>>
import {MeetingTypeEnum} from 'parabol-client/types/graphql'
import {SharingScopeEnum} from '../../client/types/graphql'
<<<<<<<
.filter({scope: 'PUBLIC', isActi... |
<<<<<<<
=======
/**
* Upgrade an account to the paid service
*/
upgradeToPro: IUpgradeToProPayload | null;
/**
* Cast a vote for the estimated points for a given dimension
*/
voteForPokerStory: VoteForPokerStoryPayload;
>>>>>>>
/**
* Cast a vote for the estimated points for a given dimens... |
<<<<<<<
const updatedReflections = [] as Partial<ReflectionCard_reflection>[]
=======
const updatedReflections = [] as Partial<IRetroReflection>[]
const reflectionGroupMapping = {} as Record<string, string>
>>>>>>>
const updatedReflections = [] as Partial<ReflectionCard_reflection>[]
const reflectionGroupM... |
<<<<<<<
import {BezierCurve} from '~/types/constEnums'
=======
import {BezierCurve, Breakpoint} from 'types/constEnums'
>>>>>>>
import {BezierCurve, Breakpoint} from '~/types/constEnums' |
<<<<<<<
import StrictEventEmitter from 'strict-event-emitter-types'
=======
import LinearPublishQueue from 'universal/LinearPublishQueue'
>>>>>>>
import StrictEventEmitter from 'strict-event-emitter-types'
import LinearPublishQueue from 'universal/LinearPublishQueue'
<<<<<<<
interface Toast {
level: 'info' | 'w... |
<<<<<<<
import { toggleWeb3Epic } from './toggleWeb3.epic';
=======
import { toggleWeb3AccountsEpic } from './toggleWeb3Accounts.epic';
import { tryToDownloadEpic } from './tryToDownload.epic';
>>>>>>>
import { tryToDownloadEpic } from './tryToDownload.epic';
import { toggleWeb3Epic } from './toggleWeb3.epic';
<<<<... |
<<<<<<<
export * from './console.actions';
export * from './deployer.actions';
=======
export * from './console.actions';
export * from './modal.actions';
>>>>>>>
export * from './console.actions';
export * from './deployer.actions';
export * from './modal.actions'; |
<<<<<<<
export * from './simpleModal';
export * from './importFileModal';
=======
export * from './simpleModal';
export * from './projectTemplateModal';
>>>>>>>
export * from './simpleModal';
export * from './importFileModal';
export * from './projectTemplateModal'; |
<<<<<<<
export * from './logLevel.model';
export * from './dependencies.model';
=======
export * from './auth.model';
export * from './dependencies.model';
export * from './transaction.model';
>>>>>>>
export * from './logLevel.model';
export * from './auth.model';
export * from './dependencies.model';
export * from ... |
<<<<<<<
export * from './account-environment.model';
export * from './logLevel.model';
=======
export * from './account-environment.model';
export * from './dependencies.model';
>>>>>>>
export * from './account-environment.model';
export * from './logLevel.model';
export * from './dependencies.model'; |
<<<<<<<
version: '1.6.1',
isEmbeddedMode: false,
isEvmReady: false
=======
version: '1.7.0',
isEmbeddedMode: false
>>>>>>>
version: '1.7.0',
isEmbeddedMode: false,
isEvmReady: false |
<<<<<<<
if (!this.configurationProvider.openIDConfiguration.trigger_authorization_result_event && !isRenewProcess) {
this.router.navigate([this.configurationProvider.openIDConfiguration.unauthorized_route]);
=======
this.resetAuthorizationData(false);
this.oidcSecur... |
<<<<<<<
if (!this.configurationProvider.openIDConfiguration.trigger_authorization_result_event && !isRenewProcess) {
this.router.navigate([this.configurationProvider.openIDConfiguration.unauthorized_route]);
=======
this.resetAuthorizationData(false);
this.oidcSecur... |
<<<<<<<
export interface RawDelegatorDeposited {
delegator: string;
zrx_deposited: string;
}
export interface RawDelegatorStaked {
delegator: string;
zrx_staked_overall: string;
pool_id: string;
zrx_staked_in_pool: string;
}
export interface RawAllTimeDelegatorPoolsStats {
pool_id: string;... |
<<<<<<<
import { SignedOrderModel } from '../models/SignedOrderModel';
import { meshUtils } from '../utils/mesh_utils';
import { orderUtils } from '../utils/order_utils';
import { paginationUtils } from '../utils/pagination_utils';
=======
import { MeshUtils } from '../mesh_utils';
import { paginate } from '../pagina... |
<<<<<<<
import { SubtaskPromptComponent } from './subtask-prompt/subtask-prompt.component';
import { TitleEditorComponent } from './title-editor/title-editor.component';
=======
import { KeySelectorComponent } from './key-selector/key-selector.component';
>>>>>>>
import { SubtaskPromptComponent } from './subtask-pro... |
<<<<<<<
import { SubtaskPromptComponent } from '../subtask-prompt/subtask-prompt.component';
=======
import { KeySelectorComponent } from '../key-selector/key-selector.component';
>>>>>>>
import { SubtaskPromptComponent } from '../subtask-prompt/subtask-prompt.component';
import { KeySelectorComponent } from '../key... |
<<<<<<<
import { Resolution } from '../models/resolution';
=======
import { IssueType } from '../models/issue-type';
import { Resolution } from '../models/resolution';
>>>>>>>
import { IssueType } from '../models/issue-type';
import { Resolution } from '../models/resolution';
<<<<<<<
resolutions = [];
=======
... |
<<<<<<<
=======
if (angular.isDefined(self.model.inputProcessor)) {
var match = matchInputProcessor(self.model.inputProcessor, self.inputProcessors);
if (angular.isDefined(match)) {
self.inputProcessor = match;
sel... |
<<<<<<<
resolveFn: resolveParams
}
=======
resolveFn: (state: StateService) => state.transition.params()
},
resolveFeed
>>>>>>>
resolveFn: resolveParams
},
resolveFeed
<<<<<<<
resolveFn: resol... |
<<<<<<<
templateUrl: "./search.html"
});
=======
templateUrl: "js/search/common/search.html"
});
export default module;
>>>>>>>
templateUrl: "./search.html"
});
export default module; |
<<<<<<<
import {SideNavService} from "../../../services/SideNavService";
=======
import SideNavService from "../../../services/SideNavService";
import {DatasetPreviewStepperDialogComponent, DatasetPreviewStepperDialogData} from "../../catalog-dataset-preview/preview-stepper/dataset-preview-stepper-dialog.component";
... |
<<<<<<<
import { IInstanceDiscoveryMetadata } from "../authority/IInstanceDiscoveryMetadata";
=======
import { CacheManager, DefaultStorageClass } from "../cache/CacheManager";
>>>>>>>
import { IInstanceDiscoveryMetadata } from "../authority/IInstanceDiscoveryMetadata";
import { CacheManager, DefaultStorageClass } f... |
<<<<<<<
dataSource = new MatTableDataSource();
length = undefined;
=======
>>>>>>>
dataSource = new MatTableDataSource();
length = undefined; |
<<<<<<<
=======
this.columns = this.getColumns();
this.sortBy = this.getSortByColumnName();
if(this.path == undefined || this.path == ""){
//attempt to get it from the selection service
this.path = this.selectionService.getLastPath(this.datasource.id) || ""
}
>... |
<<<<<<<
import {FeedLoadingService} from './feeds/define-feed-ng2/services/feed-loading-service';
import {DefineFeedService} from './feeds/define-feed-ng2/services/define-feed.service';
import {FeedAccessControlService} from './feeds/define-feed-ng2/services/feed-access-control.service';
=======
import {SlaService} f... |
<<<<<<<
import {MatButtonToggleModule} from "@angular/material/button-toggle";
=======
import {CatalogDatasetPreviewModule} from "../../catalog-dataset-preview/catalog-dataset-preview.module";
>>>>>>>
import {MatButtonToggleModule} from "@angular/material/button-toggle";
import {CatalogDatasetPreviewModule} from "..... |
<<<<<<<
import { AccessTokenEntity } from "./entities/AccessTokenEntity";
import { ScopeSet } from "../request/ScopeSet";
=======
import { IdTokenEntity } from "./entities/IdTokenEntity";
import { AccessTokenEntity } from "./entities/AccessTokenEntity";
import { RefreshTokenEntity } from "./entities/RefreshTokenEntit... |
<<<<<<<
request: any
// tslint:disable-next-line:no-any
[index: string]: any
=======
[index: string]: any,
initEditorContent?: string
>>>>>>>
request: any
// tslint:disable-next-line:no-any
[index: string]: any
initEditorContent?: string
<<<<<<<
trace = async (topicId: number, identifyId: number... |
<<<<<<<
ID_TOKEN = "IdToken",
ACCESS_TOKEN = "AccessToken",
REFRESH_TOKEN = "RefreshToken",
APP_METADATA = "AppMetadata",
TEMPORARY = "TempCache",
UNDEFINED = "Undefined"
=======
APP_META_DATA = "AppMetadata",
TEMPORARY = "TempCache",
TELEMETRY = "Telemetry",
>>>>>>>
ID_TOKEN ... |
<<<<<<<
import { resolveThemeAddress, acceptThemeCLI } from './themes'
import { updateTrayIcon, updateTrayMenu } from './tray'
=======
import { acceptThemeCLI } from './themes'
>>>>>>>
import { resolveThemeAddress, acceptThemeCLI } from './themes'
import { updateTrayIcon, updateTrayMenu } from './tray'
import { acce... |
<<<<<<<
import { USER_TOKENS, USERS } from '../ChatUsers';
function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min)) + min;
}
=======
>>>>>>>
function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min)) + min;
}
<<<<<<<
const loginUser = async (config: LoginCon... |
<<<<<<<
import BigNumber from "big.js"
=======
import fetch from "isomorphic-fetch"
>>>>>>>
import BigNumber from "big.js"
import fetch from "isomorphic-fetch" |
<<<<<<<
import { Observable, Subject, Subscription } from 'rxjs';
import { ComponentLoaderFactory } from '../component-loader/component-loader.factory';
import { ComponentLoader } from '../component-loader/component-loader.class';
=======
import { Subscription } from 'rxjs';
import { ComponentLoaderFactory, Component... |
<<<<<<<
/// <reference path="../tsd.d.ts" />
import {Component, View, bootstrap, NgClass} from 'angular2/angular2';
import {Ng2BootstrapConfig, Ng2BootstrapTheme} from '../components/index';
let w:any = window;
if (w && w.__theme === 'bs4') {
Ng2BootstrapConfig.theme = Ng2BootstrapTheme.BS4;
}
import {AccordionSec... |
<<<<<<<
/** provides possibility to set keyNavigations enable or disable, by default is enable */
isKeysAllowed = true;
=======
/** aria label for tab list */
ariaLabel = 'Tabs';
>>>>>>>
/** provides possibility to set keyNavigations enable or disable, by default is enable */
isKeysAllowed = true;
/**... |
<<<<<<<
import { TestBed, ComponentFixture, tick, fakeAsync } from '@angular/core/testing';
import { asNativeElements, EventEmitter } from '@angular/core';
=======
/* tslint:disable: max-file-line-count */
import { asNativeElements } from '@angular/core';
import { BrowserAnimationsModule } from '@angular/platform-bro... |
<<<<<<<
.to('body')
.show({
content,
isAnimated: this.config.animated,
initialState: this.config.initialState,
bsModalService: this,
id: this.config.id
});
modalContainerRef.instance.level = this.getModalsCount();
=======
.to('body');
>>>>>>>
... |
<<<<<<<
.map((_val: string): Date =>
parseDate(_val, this._picker._config.rangeInputFormat, this._localeService.currentLocale))
=======
.map((_val: string): Date => {
if (this._picker._config.useUtc) {
return utcAsLocal(
parseDate(_val, this._picker.... |
<<<<<<<
import { Injectable } from '@angular/core';
import { ClassName, CloseInterceptorFn, DismissReasons, Selector, TransitionDurations } from './models';
=======
import { Injectable, StaticProvider, InjectionToken } from '@angular/core';
import { ClassName, DismissReasons, Selector, TransitionDurations } from './m... |
<<<<<<<
import { DemoDatePickerTooltipToSelectedDates } from './demos/tooltip-to-selected-dates/tooltip-to-selected-dates';
=======
import { DemoDateRangePickerMaxDateRangeComponent } from './demos/max-date-range/max-date-range';
import { DemoDateRangePickerDisplayOneMonth } from './demos/daterangepicker-display-one-... |
<<<<<<<
outlet: DemoDatepickerTodayButtonComponent
},
{
title: 'Show Clear Button',
anchor: 'datepicker-show-clear-button',
component: require('!!raw-loader!./demos/clear-button/clear-button.ts'),
html: require('!!raw-loader!./demos/clear-button/clear-button.html'),
... |
<<<<<<<
import { BasePlugin, PluginInfo } from 'lisk-framework';
import { RawBlock, RawBlockHeader } from '@liskhq/lisk-chain';
import { codec } from '@liskhq/lisk-codec';
import { hash } from '@liskhq/lisk-cryptography';
=======
import { RawBlock, RawBlockHeader } from '@liskhq/lisk-chain';
import { codec } from '@l... |
<<<<<<<
// Max rate of WebSocket messages per second per peer.
export const DEFAULT_WS_MAX_MESSAGE_RATE = 100;
export const DEFAULT_RATE_CALCULATION_INTERVAL = 1000;
=======
export const DEFAULT_WS_MAX_PAYLOAD = 1048576; // Payload in bytes
>>>>>>>
// Max rate of WebSocket messages per second per peer.
export const ... |
<<<<<<<
verifyAmountBalance,
verifyBalance,
verifyMultiSignatureTransaction,
=======
verifyMinRemainingBalance,
verifyMultiSignatures,
>>>>>>>
verifyMinRemainingBalance,
verifyMultiSignatureTransaction,
<<<<<<<
verifyBalance,
verifyMultiSignatureTransaction,
=======
verifyMultiSignatures,
>>>>>>>
veri... |
<<<<<<<
import { validator } from '../utils';
=======
import { CreateBaseTransactionInput, validator } from '../utils';
import { isTypedObjectArrayWithKeys } from '../utils/validation';
>>>>>>>
import { CreateBaseTransactionInput, validator } from '../utils';
<<<<<<<
public static create(input: RegisterDelegateInp... |
<<<<<<<
undoSteps = [jest.fn(), jest.fn()];
blockProcessorV1.forkStatus.pipe(forkSteps);
blockProcessorV1.validate.pipe(validateSteps);
blockProcessorV1.verify.pipe(verifySteps);
blockProcessorV1.apply.pipe(applySteps);
blockProcessorV1.undo.pipe(undoSteps);
processor.register(blockProcessorV1, {
... |
<<<<<<<
import { discoverPeers } from './peer_discovery';
import { getUniquePeersbyIp } from './peer_selection';
=======
>>>>>>>
import { getUniquePeersbyIp } from './peer_selection';
<<<<<<<
maxPeerListSize: MAX_PEER_LIST_BATCH_SIZE,
=======
wsMaxMessageRate: this._peerPoolConfig.wsMaxMessageRate,
wsMax... |
<<<<<<<
import { Status, TransactionJSON } from '../transaction_types';
import { prependMinusToPublicKeys, prependPlusToPublicKeys } from '../utils';
=======
import { Account, Status, TransactionJSON } from '../transaction_types';
import { CreateBaseTransactionInput } from '../utils';
>>>>>>>
import { TransactionJSO... |
<<<<<<<
// Remove these wsPort and ip from the query object
const {
wsPort,
ip,
advertiseAddress,
...restOfQueryObject
} = queryObject;
=======
// Remove these wsPort and ipAddress from the query object
const { wsPort, ipAddress, ...restOfQueryObject } = queryObject;
>>>>>>>
... |
<<<<<<<
import { InboundPeer } from '../../src/peer';
=======
import { SCServerSocket } from 'socketcluster-server';
import * as url from 'url';
import cloneDeep = require('lodash.clonedeep');
>>>>>>>
import { InboundPeer } from '../../src/peer';
import { SCServerSocket } from 'socketcluster-server';
import * as url... |
<<<<<<<
import { Forger, ForgerInfo, Options, TransactionFees } from './types';
import { DB_KEY_FORGER_INFO } from './constants';
import { forgerInfoSchema } from './schema';
import { Web } from './hooks';
=======
import { Forger, Options, TransactionFees } from './types';
const BLOCKS_BATCH_TO_SYNC = 1000;
>>>>>>>... |
<<<<<<<
export const DEFAULT_POPULATOR_INTERVAL = 10000;
=======
export const DEFAULT_SEND_PEER_LIMIT = 25;
>>>>>>>
export const DEFAULT_POPULATOR_INTERVAL = 10000;
export const DEFAULT_SEND_PEER_LIMIT = 25;
<<<<<<<
await this._startDiscovery(seedPeerInfos);
this._startPopulator();
=======
await this._star... |
<<<<<<<
P2PPeersCount,
P2PPeerSelectionForConnection,
P2PPeerSelectionForRequest,
P2PPeerSelectionForSend,
=======
P2PPeerSelectionForConnectionFunction,
P2PPeerSelectionForRequestFunction,
P2PPeerSelectionForSendFunction,
>>>>>>>
P2PPeersCount,
P2PPeerSelectionForConnectionFunction,
P2PPeerSelectionForReq... |
<<<<<<<
DEFAULT_BAN_TIME,
DEFAULT_MAX_INBOUND_CONNECTIONS,
DEFAULT_MAX_OUTBOUND_CONNECTIONS,
DEFAULT_MAX_PEER_DISCOVERY_RESPONSE_LENGTH,
DEFAULT_MAX_PEER_INFO_SIZE,
DEFAULT_MIN_PEER_DISCOVERY_THRESHOLD,
DEFAULT_NODE_HOST_IP,
DEFAULT_OUTBOUND_SHUFFLE_INTERVAL,
DEFAULT_PEER_PROTECTION_FOR_LATENCY,
DEFAULT_PEER_... |
<<<<<<<
createBaseTransaction,
StateStore,
StateStorePrepare,
=======
ENTITY_ACCOUNT,
EntityMap,
TransactionResponse,
>>>>>>>
StateStore,
StateStorePrepare,
<<<<<<<
public static create(input: TransferInput): object {
validateInputs(input);
const {
amount,
recipientId: recipientIdInput,
recipi... |
<<<<<<<
readonly totalAmount: string;
=======
readonly totalAmount: bigint;
readonly epochTime: string;
>>>>>>>
readonly totalAmount: bigint; |
<<<<<<<
this._handleBanPeer = (peerId: string) => {
this._bannedPeers.add(peerId.split(':')[0]);
if (this._triedPeers.has(peerId)) {
this._triedPeers.delete(peerId);
}
if (this._newPeers.has(peerId)) {
this._newPeers.delete(peerId);
}
// Re-emit the message to allow it to bubble up the clas... |
<<<<<<<
P2PPeerSelectionForConnection,
P2PPeerSelectionForRequest,
P2PPeerSelectionForSend,
P2PPenalty,
=======
P2PPeerSelectionForConnectionFunction,
P2PPeerSelectionForRequestFunction,
P2PPeerSelectionForSendFunction,
>>>>>>>
P2PPeerSelectionForConnectionFunction,
P2PPeerSelectionForRequestFunction,
P2PP... |
<<<<<<<
peer.connect();
return peer;
}
public addDiscoveredPeer(
detailedPeerInfo: P2PDiscoveredPeerInfo,
inboundSocket?: SCServerSocket,
): Peer {
const peerConfig = {
connectTimeout: this._peerPoolConfig.connectTimeout,
ackTimeout: this._peerPoolConfig.ackTimeout,
banTime: this._peerPoolConfig... |
<<<<<<<
describe('Fully connected network with a custom maximum payload', () => {
const dataLargerThanMaxPayload = [
{
ip: '100.100.100.100',
os: 'linux4.18.0-20-generic',
version: '2.0.0-rc.0',
wsPort: 7001,
httpPort: 7000,
protocolVersion: '1.1',
height: 8691420,
broadhash:
... |
<<<<<<<
describe('TransactionPool class', () => {
let applyTransactionStub = jest.fn();
=======
describe('TransactionList class', () => {
let applyTransactionsStub = jest.fn();
>>>>>>>
describe('TransactionPool class', () => {
let applyTransactionsStub = jest.fn();
<<<<<<<
applyTransaction: applyTransactionStu... |
<<<<<<<
'13': 'vote',
=======
'14': 'unlock',
>>>>>>>
'13': 'vote',
'14': 'unlock', |
<<<<<<<
=======
// FIXME: This is log to supress ts build error
// Remove this line after using this._transactionExpiryTime
debug('TransactionPool expiry time', this._transactionExpiryTime);
>>>>>>> |
<<<<<<<
EVENT_BAN_PEER,
EVENT_UNBAN_PEER,
=======
EVENT_FAILED_TO_PUSH_NODE_INFO,
EVENT_DISCOVERED_PEER,
EVENT_FAILED_TO_FETCH_PEER_INFO,
>>>>>>>
EVENT_BAN_PEER,
EVENT_UNBAN_PEER,
EVENT_FAILED_TO_PUSH_NODE_INFO,
EVENT_DISCOVERED_PEER,
EVENT_FAILED_TO_FETCH_PEER_INFO,
<<<<<<<
private readonly _handleOutbo... |
<<<<<<<
const [unincludedTransaction, ...transactions] = transactionObjects.map(wrapTransferTransaction);
=======
const [unincludedTransaction, ...includedTransactions] = transactions.map(wrapTransferTransaction);
>>>>>>>
const [unincludedTransaction, ...transactions] = transactionObjects.map(
wrapTransferTrans... |
<<<<<<<
const startPM2 = async (installPath: string, name: string): Promise<void> =>
new Promise<void>((resolve, reject) => {
start(
{
name,
script: 'app.js',
args: '-c config.json',
cwd: installPath,
pid: path.join(installPath, '/pids/lisk.app.pid'),
output: path.join(installPath, '/logs/... |
<<<<<<<
export const DEFAULT_BAN_TIME = 86400;
=======
export const DEFAULT_SEND_PEER_LIMIT = 25;
>>>>>>>
export const DEFAULT_BAN_TIME = 86400;
export const DEFAULT_SEND_PEER_LIMIT = 25;
<<<<<<<
: selectForConnection,
peerBanTime: config.peerBanTime ? config.peerBanTime : DEFAULT_BAN_TIME,
=======
: s... |
<<<<<<<
recipientId: 'a28d5e34007fd8fe6d7903044eb23a60fdad3c00',
amount: '100',
=======
recipientId: '123L',
amount: '10000000000',
>>>>>>>
recipientId: '123L',
amount: '10000000000',
<<<<<<<
recipientId: 'a28d5e34007fd8fe6d7903044eb23a60fdad3c00',
amount: '100',
===... |
<<<<<<<
=======
MIN_FEE_PER_BYTE,
UNCONFIRMED_MULTISIG_TRANSACTION_TIMEOUT,
>>>>>>>
MIN_FEE_PER_BYTE,
<<<<<<<
public readonly timestamp: number;
=======
public readonly signatures: string[];
>>>>>>>
<<<<<<<
this._senderPublicKey = tx.senderPublicKey || '';
this._signatures = (tx.signatures as string[]... |
<<<<<<<
import { FormEvent, RefObject, SyntheticEvent } from "react";
=======
import { FocusEvent, RefObject } from "react";
>>>>>>>
import { FormEvent, FocusEvent, RefObject, SyntheticEvent } from "react";
<<<<<<<
handleSubmit: HandleSubmit;
controller: Controller<any, V>;
=======
controller: C... |
<<<<<<<
form: RefObject<HTMLFormElement>;
field: Field<V>;
=======
formRef: RefObject<HTMLFormElement>;
field: FieldRef<V>;
>>>>>>>
form: RefObject<HTMLFormElement>;
field: FieldRef<V>; |
<<<<<<<
describe('errors', () => {
it('raises error when folder does not exist', async () => {
const testRepoPath = path.join(temp.path(), 'desktop-does-not-exist')
let error: Error | null = null
try {
await GitProcess.execWithOutput([ 'show', 'HEAD' ], testRepoPath)
} catch (e) {... |
<<<<<<<
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { HotkeyGroup, HotkeysService } from '../hotkeys.service';
=======
import { Component } from '@angular/core';
import { HotkeysService } from '../hotkeys.service';
>>>>>>>
import { Component, EventEmitter, Input, Output } from '@a... |
<<<<<<<
export class PdfViewerComponent extends OnInit {
private static CSS_UNITS: number = 96.0 / 72.0;
private _showAll: boolean = true; // TODO : _showAll is not working
=======
export class PdfViewerComponent implements OnChanges {
private _showAll: boolean = false;
>>>>>>>
export class PdfViewerComponent... |
<<<<<<<
import { ComponentInt, ComponentsInt, PropInt, ChildInt } from '../utils/Interfaces.ts';
=======
import {
ComponentInt, ComponentsInt, PropInt, ChildInt, Action, ApplicationStateInt
} from '../utils/Interfaces.ts';
>>>>>>>
import {
ComponentInt,
ComponentsInt,
PropInt,
ChildInt,
Action,
Applica... |
<<<<<<<
preferImmutableCall?: boolean;
=======
}
export interface DepSymbolResolver {
shouldSymbolDefinitelyBeIgnoreInDeps: (
rawSymbol: ts.Symbol
) => boolean | undefined;
alreadyDuplicated: (rawSymbol: ts.Symbol) => boolean;
markAsDuplicated: (symbol: ts.Symbol) => void;
isExpressio... |
<<<<<<<
import { SchemaRequestService, WorkspaceContextService, PromiseConstructor, Thenable, MatchingSchema, TextDocument } from '../jsonLanguageTypes';
=======
import { SchemaRequestService, WorkspaceContextService, PromiseConstructor, Thenable } from '../jsonLanguageTypes';
>>>>>>>
import { SchemaRequestService... |
<<<<<<<
import * as EventEmitter from 'eventemitter2';
import { ExtensionConfiguration } from './extensionConfiguration';
import { setupLiveShare } from './liveShare';
import ContentProvider from './contentProvider';
=======
>>>>>>>
<<<<<<<
setupLiveShare(windowManager);
}
export class BrowserViewWindowManager ... |
<<<<<<<
import 'intersection-observer-polyfill'
import { store } from './store'
=======
import { createBrowserHistory } from 'history'
import { createStore } from './store'
>>>>>>>
import { createBrowserHistory } from 'history'
import 'intersection-observer-polyfill'
import { createStore } from './store' |
<<<<<<<
getBudgetMonth(budgetId: string, month: Date, options?: any): (fetchFunction?: FetchAPI) => Promise<MonthDetailResponse>;
getBudgetMonths(budgetId: string, options?: any): (fetchFunction?: FetchAPI) => Promise<MonthSummariesResponse>;
=======
getBudgetMonth(budgetId: string, month: string | Date, ... |
<<<<<<<
getBudgetMonth(budgetId: string, month: Date, options?: any): (fetchFunction?: FetchAPI) => Promise<MonthDetailResponse> {
=======
getBudgetMonth(budgetId: string, month: Date | string, options?: any): (fetchFunction?: FetchAPI, basePath?: string) => Promise<MonthDetailResponse> {
>>>>>>>
... |
<<<<<<<
faMoon,
faSun,
=======
faCheckCircle,
>>>>>>>
faMoon,
faSun,
faCheckCircle,
<<<<<<<
faMoon,
faSun,
=======
faCheckCircle,
>>>>>>>
faMoon,
faSun,
faCheckCircle, |
<<<<<<<
import { isNodeExported, findPiralBaseApi, findDeclaredTypings } from './helpers';
import { includeExportedType, includeExportedVariable, includeExportedTypeAlias } from './visit';
=======
import { isNodeExported, findPiralCoreApi, findDeclaredTypings } from './helpers';
>>>>>>>
import { isNodeExported, find... |
<<<<<<<
export * from './avalanche';
=======
>>>>>>>
export * from './avalanche';
<<<<<<<
export * from './apis/admin/api';
export * from './apis/keystore/api';
export * from './apis/platform/api';
=======
export * from './utils/types';
>>>>>>>
export * from './apis/admin/api';
export * from './apis/keystore/api... |
<<<<<<<
import { pipeline, logger, dateToUnixTimeSeconds } from '../utils'
=======
import { pipelineAsync, logger } from '../utils'
>>>>>>>
import { pipelineAsync, logger, dateToUnixTimeSeconds } from '../utils' |
<<<<<<<
this.userId = params.userId || params.email; // Riot uses `email` when placing a conference call
this.isAudioOnly = params.isAudioOnly === 'true';
this.toggleVideo = !this.isAudioOnly;
=======
this.userId = params.userId || params.email; // Element uses `email` when placing a ... |
<<<<<<<
import WebhookBridgeRecord from "./models/WebhookBridgeRecord";
=======
import TelegramBridgeRecord from "./models/TelegramBridgeRecord";
>>>>>>>
import TelegramBridgeRecord from "./models/TelegramBridgeRecord";
import WebhookBridgeRecord from "./models/WebhookBridgeRecord";
<<<<<<<
WebhookBridg... |
<<<<<<<
import { AdminWidgetWhiteboardConfigComponent } from "./whiteboard/whiteboard.component";
=======
import { TranslateService } from "@ngx-translate/core";
>>>>>>>
import { AdminWidgetWhiteboardConfigComponent } from "./whiteboard/whiteboard.component";
import { TranslateService } from "@ngx-translate/core"; |
<<<<<<<
import { GenericNotificationHandler, LanguageClient, LanguageClientOptions, StreamInfo } from 'vscode-languageclient';
=======
import { LanguageClient, LanguageClientOptions, StreamInfo } from 'vscode-languageclient';
import { getGVMConfig } from './graalVMConfiguration';
>>>>>>>
import { GenericNotification... |
<<<<<<<
process.exitCode = validate(input, getFilteredIds(filter, input),
path.join(__dirname,
'../node_modules/lsif-protocol/lib/protocol.d.ts'));
=======
process.exitCode = validate(
input,
getFilteredIds(filter, input),
path.join(path.dirname(process.argv[1]), '... |
<<<<<<<
* Initializes the Schema templates and block templates.
=======
* Removes all line breaks from a string.
*
* @returns {string} The converted string.
*/
function getTemplate(): string {
return this.innerHTML.split( "\n" ).map( s => s.trim() ).join( "" );
}
/**
* Initializes schema-templates.
>>>>>>>
... |
<<<<<<<
import { InstructionObject } from "../../core/Instruction";
=======
import { RenderEditProps } from "../../core/blocks/BlockDefinition";
import { getBlockByClientId } from "../../functions/BlockHelper";
import RequiredBlocks from "../../blocks/RequiredBlocks";
>>>>>>>
import { RenderEditProps } from "../../c... |
<<<<<<<
import { BlockInstance } from "@wordpress/blocks";
import { isArray, mergeWith } from "lodash";
=======
import { merge } from "lodash";
import { BlockInstance } from "@wordpress/blocks";
import { BlockValidation, BlockValidationResult } from "./validation";
>>>>>>>
import { BlockValidation, BlockValidationRe... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.