conflict_resolution
stringlengths
27
16k
<<<<<<< import * as NOTIFICATION from './notificationConstants'; ======= import * as NOTIFICATION from './notification'; import * as TOKEN from './token'; >>>>>>> import * as NOTIFICATION from './notificationConstants'; import * as TOKEN from './token';
<<<<<<< sentAt: string; ======= isWhisper?: boolean; >>>>>>> sentAt: string; isWhisper?: boolean;
<<<<<<< ======= // set grid size to 1px (smallest grid) gridSize: 1, >>>>>>> <<<<<<< } /** * This function is provided to JointJS to disable some invalid connections on the UI. * If the connection is invalid, users are not able to connect the links on the UI. * * https://resources.jointjs.com/docs/join...
<<<<<<< this.handleViewDeleteLink(); ======= this.handleWindowDrag(); this.handlePaperMouseZoom(); >>>>>>> this.handleViewDeleteLink(); this.handleWindowDrag(); this.handlePaperMouseZoom();
<<<<<<< ======= public onClickRunHandler = () => {}; >>>>>>> public onClickRunHandler = () => {}; <<<<<<< if (!this.isWorkflowValid) { return { text: 'Run', spinner: false, disable: true, onClick: () => { } }; ======= if (! isWorkflowValid) { return { text: 'Error', i...
<<<<<<< const uploadFileListURL = 'assume it exist'; const uploadUserDictionaryURL = 'assume it exist'; const uploadDictionaryUrl = apiUrl + '/upload/dictionary'; ======= export interface GenericWebResponse { code: number; message: string; } >>>>>>> const uploadFileListURL = 'assume it exist'; const uploadUserDi...
<<<<<<< import { ExecutionResult } from '../../types/execute-workflow.interface'; import { WorkflowStatusService } from '../../service/workflow-status/workflow-status.service'; import { WebsocketService} from '../../service/websocket/websocket.service'; import {NgbModal, NgbActiveModal} from '@ng-bootstrap/ng-bootstra...
<<<<<<< downloadExecutionResultEnabled: false, userSystemEnabled: false, amberEngineEnabled: true, ======= downloadExecutionResultEnabled: false, /** * whether linkBreakpoint is supported */ linkBreakpointEnabled: true, >>>>>>> downloadExecutionResultEnabled: false, userSystemEnabled: fals...
<<<<<<< this.workflowActionService.addOperator(operator, this.jointUIService.getJointOperatorElement(operator, value.offset)); this.workflowActionService.getJointGraphWrapper().highlightOperator(operator.operatorID); ======= this.workflowActionService.addOperator(operator, value.offset); >>>>...
<<<<<<< constructor(private executeWorkflowService: ExecuteWorkflowService, private workflowActionService: WorkflowActionService, public tourService: TourService, public undoRedo: UndoRedoService) { ======= // variable binded with HTML to decide if the running spinner should show public showSpinner = false;...
<<<<<<< this.workflowActionService.addOperator(operator, value.offset); // has suggestion and must auto-create the operator link between 2 operators. if (this.suggestionOperator !== undefined) { if (this.isSuggestionOnLeft) { const linkCell = this.getNewOperatorLink(this.s...
<<<<<<< DragDropService, ======= { provide: WorkflowActionService, useClass: StubWorkflowActionService }, >>>>>>> DragDropService, { provide: WorkflowActionService, useClass: StubWorkflowActionService },
<<<<<<< let workflowStatusService: WorkflowStatusService; ======= let undoRedoService: UndoRedoService; >>>>>>> let workflowStatusService: WorkflowStatusService; let undoRedoService: UndoRedoService; <<<<<<< workflowStatusService = TestBed.get(WorkflowStatusService); ======= undoRedoService = Tes...
<<<<<<< import { UserDictionary} from '../../../type/user-dictionary'; ======= import { UserDictionary } from '../../../service/user-dictionary/user-dictionary.interface'; >>>>>>> import { UserDictionary } from '../../../service/user-dictionary/user-dictionary.interface'; <<<<<<< public UserDictionary: UserDictio...
<<<<<<< import { mockScanPredicate, mockPoint } from '../../service/workflow-graph/model/mock-workflow-data'; import { ResultPanelToggleService } from '../../service/result-panel-toggle/result-panel-toggle.service'; import { marbles } from 'rxjs-marbles'; ======= import { mockScanPredicate, mockPoint, mockScanRes...
<<<<<<< it('should create an JointJS Element successfully when the function is called', () => { const result = service.getJointjsOperatorElement( getMockScanPredicate(), getMockPoint()); ======= it('should create an JointJS Element successfully', () => { const result = service.getJointOperatorElemen...
<<<<<<< import * as Ajv from 'ajv'; ======= import { Subject } from 'rxjs/Subject'; import { Observable } from 'rxjs/Observable'; >>>>>>> import * as Ajv from 'ajv'; import { Subject } from 'rxjs/Subject'; import { Observable } from 'rxjs/Observable'; <<<<<<< // used to fetch default values in json schema to in...
<<<<<<< import { WorkflowUtilService } from './../../service/workflow-graph/util/workflow-util.service'; import { WorkflowActionService } from './../../service/workflow-graph/model/workflow-action.service'; import { JointModelService } from './../../service/workflow-graph/model/jointjs-model.service'; import { Componen...
<<<<<<< private table: object[]; // private columns: string[] = []; ======= @Input() data: DialogData | null = null; private table: object[] = []; private columns: string[] = []; >>>>>>> @Input() data: DialogData | null = null; private table: object[] = []; // private columns: string[] = [];
<<<<<<< import { forEach } from '@angular/router/src/utils/collection'; import { CompileMetadataResolver } from '@angular/compiler'; import { NoneComponent } from 'angular6-json-schema-form'; import { JSONSchema4 } from 'json-schema'; ======= import { IndexableObject } from '../../types/result-table.interface'; >>>>...
<<<<<<< private resultPanelToggleService: ResultPanelToggleService, ======= private validationWorkflowService: ValidationWorkflowService, private jointUIService: JointUIService, >>>>>>> private resultPanelToggleService: ResultPanelToggleService, private validationWorkflowService: ValidationWorkfl...
<<<<<<< export interface IndexableObject extends Readonly<{ [key: string]: object | string | boolean | symbol | number | Array<object>; }> { } ======= import { JSONSchema4 } from 'json-schema'; import { IndexableObject } from '../../types/result-table.interface'; >>>>>>> export interface IndexableObject extends R...
<<<<<<< import { DragDropService } from './../../service/drag-drop/drag-drop.service'; import { Observable } from 'rxjs'; ======= import { environment } from '../../../../environments/environment'; >>>>>>> import { DragDropService } from './../../service/drag-drop/drag-drop.service'; import { environment } from '.....
<<<<<<< import { Component, ViewChild} from '@angular/core'; import { Response, Http } from '@angular/http'; ======= import {Component, ViewChild, OnInit} from '@angular/core'; >>>>>>> import {Component, ViewChild, OnInit} from '@angular/core'; import { Response, Http } from '@angular/http';
<<<<<<< // set grid size to 1px (smallest grid) gridSize: 1, ======= >>>>>>> <<<<<<< ======= } /** * This function is provided to JointJS to disable some invalid connections on the UI. * If the connection is invalid, users are not able to connect the links on the UI. * * https://resources.jointjs.co...
<<<<<<< public formlyJsonschema: FormlyJsonschema, public workflowActionService: WorkflowActionService, public autocompleteService: DynamicSchemaService, public executeWorkflowService: ExecuteWorkflowService, private ref: ChangeDetectorRef ======= private formlyJsonschema: FormlyJsonschema, ...
<<<<<<< where(field: string | FieldPath, opStr: WhereFilterOp | StrapiWhereOperator | RegExp, value: any): Queryable<T>; whereAny(filters: ManualFilter[]): Queryable<T>; orderBy(field: string | FieldPath, directionStr?: OrderByDirection): Queryable<T>; limit(limit: number): Queryable<T>; offset(offset: number...
<<<<<<< mime?: Mime; ======= mime?: string; animated?: boolean; >>>>>>> mime?: Mime; animated?: boolean;
<<<<<<< export { Util, CorrelationIdHelper, UrlHelper } from './Util'; export { FieldType } from './Enums'; ======= export { Util, CorrelationIdHelper, UrlHelper, DateTimeUtils } from './Util'; export { _InternalMessageId, LoggingSeverity, FieldType } from './Enums'; export { _InternalLogging, _InternalLogMessage } f...
<<<<<<< import Currencies from 'tf2-currencies'; import { OfferData } from '@tf2autobot/tradeoffer-manager'; ======= import Currencies from 'tf2-currencies-2'; import { OfferData } from 'steam-tradeoffer-manager'; >>>>>>> import Currencies from 'tf2-currencies-2'; import { OfferData } from '@tf2autobot/tradeoffer-ma...
<<<<<<< for (let i = 0; i < old.length; i++) { const currPrice = old[i]; if (currPrice.autoprice !== true) { continue; } if (/;[p][0-9]+/.test(currPrice.sku)) { ======= const oldCount = old.length; ...
<<<<<<< '!price [amount] <name> - Get the price and stock of an item 💲📦\n\n📌=== Instant item trade ===📌', ======= '!owner - Get the owner Steam profile and Backpack.tf links', '!price [amount] <name> - Get the price and stock of an item 💲📦\n\n✨=== Instant item trade ===✨', >>>>>>> '!owner - Get...
<<<<<<< /** * @ignore * @description Internal only * @type {boolean} * @memberof IConfig */ ======= enableOldTags?: boolean; // Internal >>>>>>> enableOldTags?: boolean; // Internal /** * @ignore * @description Internal only * @type {boolea...
<<<<<<< export class ElementWidth implements AfterViewInit { public ngAfterViewInit(): void { this.elementWidth.emit(this.el.nativeElement.clientWidth); ======= export class ElementWidthDirective implements OnInit { @Output() public elementWidth = new EventEmitter(); ngOnInit(): void { setTimeout(()...
<<<<<<< export {ParamsOf} from './ParamsOf' export {LengthOf} from './LengthOf' export {Piper, Piped} from './Pipe' export {ReturnOf} from './ReturnOf' ======= export {Function} from './Function' export {NoInfer} from './NoInfer' export {Parameters} from './Parameters' export {Piper, Pipe} from './Pipe' export {Retur...
<<<<<<< // making docker compose file // indentation is important in yaml files // checking if compose file already exists. If it does not, it will make one if (!fs.existsSync(composeFilePath)) { // spacing matters so it looks weird on purpose try { fs.writeFileSync(composeFilePath, `version: "3"\...
<<<<<<< const authRoute = require('../../src/server/routes/auth-route'); const apiRoute = require('../../src/server/routes/api-route'); const dockerRoute = require('../../src/server/routes/docker-route'); ======= const authRoute = require("../../src/server/routes/auth-route"); const apiRoute = require("../../src/serv...
<<<<<<< import { MLKitDetectFacesOnDeviceOptions, MLKitDetectFacesOnDeviceResult, MLKitDetectFacesResultBounds } from "./"; import { MLKitOptions } from "../index"; ======= import { MLKitVisionOptions } from "../"; import { MLKitDetectFacesOnDeviceOptions, MLKitDetectFacesOnDeviceResult } from "./"; >>>>>>> import {...
<<<<<<< headerType?: 'TabbedHeader' | 'DetailsHeader' | 'AvatarHeader'; scrollRef?:(ref:ScrollView)=>void | object; ======= headerType?: 'TabbedHeader' | 'DetailsHeader' | 'AvatarHeader'; keyboardShouldPersistTaps?: 'always' | 'never' | 'handled' | false | true; >>>>>>> headerType?: 'TabbedHeader' | 'Detai...
<<<<<<< export interface IProductInputDTO { name: string; } export interface FetchProductForGridView extends IProduct { modDate: Date; productImages: Image[]; category: Category; } export interface ProductVerGridView { productId: string; imageLink: string; category: string; likeDate: Date; } export i...
<<<<<<< import { fetchLikeProductDataSaga, LikeListAction, likeReducer } from 'redux/ducks/likeList'; import { authReducer, UserProps, UserAction } from './auth'; import { categoryReducer, CategoryAction, CategoryProps } from './category'; import { ProductProps, LikeListDucksProps } from './Interface'; ======= import...
<<<<<<< import { fetchLikeProductDataSaga, LikeListAction, likeReducer } from 'redux/ducks/likeList'; import { authReducer, UserProps, UserAction } from './auth'; import { categoryReducer, CategoryAction, CategoryProps } from './category'; import { ProductProps, LikeListDucksProps } from './Interface'; ======= import...
<<<<<<< import { IUser, IProduct, Prefer, IProductDTO, RecommenderResult } from '../interfaces'; ======= import { IUser, IProduct, ProductVerGridView, FetchProductForGridView, } from '../interfaces'; >>>>>>> import { IUser, IProduct, ProductVerGridView, FetchProductForGridView, Prefer, IPro...
<<<<<<< import { loadBookmarks, saveBookmarks } from "../vscode-bookmarks-core/src/model/workspaceState"; ======= import { expandSelectionToNextBookmark, shrinkSelection, selectBookmarkedLines } from "../vscode-bookmarks-core/src/selections"; >>>>>>> import { loadBookmarks, saveBookmarks } from "../vscode-bookmarks-...
<<<<<<< import { SEARCH_EDITOR_SCHEME } from "./constants"; ======= import { suggestLabel, useSelectionWhenAvailable } from "./suggestion"; >>>>>>> import { SEARCH_EDITOR_SCHEME } from "./constants"; import { suggestLabel, useSelectionWhenAvailable } from "./suggestion"; <<<<<<< }; bookmarks.active...
<<<<<<< if (error !== 'cancel') { J.Util.error("Failed to process input."); deferred.reject(error); ======= if (error != 'cancel') { this.ctrl.logger.error("Failed to process input.", error); deferred.rejec...
<<<<<<< properties: Object; measurements: Object; ======= autoTrackPageVisitTime: boolean; >>>>>>> autoTrackPageVisitTime: boolean; properties: Object; measurements: Object;
<<<<<<< outputWindow.appendLine('> Server Parse Successful! \n'); ======= const newState = await context.workspaceState.get(`obj`); console.log('newState: ', newState); >>>>>>> outputWindow.appendLine('> Server Parse Successful! \n'); const newState = await context.workspaceState.get(`obj`); ...
<<<<<<< body: await this.emailTemplateService.getRenderedTemplate('1_initiate_signup', {name: `${userData.firstName} ${userData.lastName}`, link: link}) ======= body: await this.emailTemplateService.getRenderedTemplate('init-signup', {name: userData.name, link: link}) >>>>>>> body: await this...
<<<<<<< (+(xhr.ajaxData.status)) < 400 ); ======= (+(xhr.ajaxData.status)) < 400, +xhr.ajaxData.status ); } catch (e) { _InternalLogging.throwInternalNonUserActionable( Loggi...
<<<<<<< ======= config.disableCorrelationHeaders = (config.disableCorrelationHeaders !== undefined && config.disableCorrelationHeaders !== null) ? Util.stringToBoolOrDefault(config.disableCorrelationHeaders) : true; >>>>>>> config.disableCorrelat...
<<<<<<< import { paginate } from '../../db/plugins/paginate'; import { IBaseDocument, IBaseModel } from '../shared/base.model'; ======= import { IBaseDocument, IBaseModel, BaseSchema } from '../shared/base.model'; >>>>>>> import { IBaseDocument, IBaseModel, BaseSchema } from '../shared/base.model'; import { paginat...
<<<<<<< sanitizer: ISanitizer, needNumbering = true, ======= sanitizer: ISanitizer >>>>>>> sanitizer: ISanitizer, needNumbering = true, <<<<<<< let numberingDict: { [level: number]: number } = { }; each(panel.notebook.widgets, cell => { ======= each(panel.content.widgets, cell => { >>...
<<<<<<< import { JavaLanguageDetector } from '../../detectors/Java/JavaLanguageDetector'; ======= import { PythonLanguageDetector } from '../../detectors/Python/PythonLanguageDetector'; >>>>>>> import { JavaLanguageDetector } from '../../detectors/Java/JavaLanguageDetector'; import { PythonLanguageDetector } from '....
<<<<<<< Event, IConfig, Util, Data, Envelope, Trace, PageViewPerformance, PageView, DataSanitizer ======= IConfig, _InternalLogging, LoggingSeverity, _InternalMessageId, Util, PageViewPerformance, PageView, IEnvelope, RemoteDependencyData, Data, Metric >>>>>>> IConfig, Util, PageV...
<<<<<<< import { DependenciesVersionPractice } from './LanguageIndependent/DependenciesVersionPractice'; import { JavaGitignoreIsPresentPractice } from './Java/JavaGitignoreIsPresentPractice'; import { JavaGitignoreCorrectlySetPractice } from './Java/JavaGitignoreCorrectlySetPractice'; ======= import { DependenciesVe...
<<<<<<< this.authenticate(); let apiUrl = `https://api.bitbucket.org/2.0/repositories/${owner}/${repo}/pullrequests`; ======= const apiUrl = `https://api.bitbucket.org/2.0/repositories/${owner}/${repo}/pullrequests`; const ownerUrl = `www.bitbucket.org/${owner}`; >>>>>>> this.authenticate(); ...
<<<<<<< import { JavaLanguageDetector } from '../../detectors/Java/JavaLanguageDetector'; ======= import { ScanningStrategy, ServiceType } from '../../detectors/ScanningStrategyDetector'; >>>>>>> import { JavaLanguageDetector } from '../../detectors/Java/JavaLanguageDetector'; import { ScanningStrategy, ServiceType ...
<<<<<<< import { JavaNamingConventionsPractice } from './Java/JavaNamingConventionsPractice'; ======= import { JavaLoggerUsedPractice } from './Java/JavaLoggerUsedPractice'; import { JavaTestingFrameworkUsedPractice } from './Java/JavaTestingFrameworkUsedPractice'; import { JavaMockingFrameworkUsedPractice } from './...
<<<<<<< const getOpenPullRequestsResponse = bitbucketNock.mockBitbucketIssuesOrPullRequestsResponse({ states: BitbucketPullRequestState.open }); expect(response).toMatchObject(getOpenPullRequestsResponse); ======= expect(response.items).toHaveLength(1); expect(response.items[0].id).toEqual(mockPr.id)...
<<<<<<< getApiResponse(resource: string, id?: number, value?: string, state?: string): nock.Scope { ======= getApiResponse(resource: string, id?: number | string, value?: string): nock.Scope { >>>>>>> getApiResponse(resource: string, id?: number | string, value?: string, state?: string): nock.Scope { <<<<<<< ...
<<<<<<< import { JavaDependenciesVersionMajorLevel } from './Java/JavaDependenciesVersionMajorLevel'; import { JavaDependenciesVersionMinorPatchLevel } from './Java/JavaDependenciesVersionMinorPatchLevel'; ======= import { TimeToSolvePullRequestsPractice } from './LanguageIndependent/TimeToSolvePullRequestsPractice';...
<<<<<<< if (determineRemote && (scanStrategy.serviceType === undefined || scanStrategy.accessType === AccessType.unknown)) { return { shouldExitOnEnd: this.shouldExitOnEnd, needsAuth: true, serviceType: scanStrategy.serviceType }; ======= if (determineRemote && scanStrategy.accessType === AccessType.unk...
<<<<<<< import { TimeToSolveIssuesPractice } from './LanguageIndependent/TimeToSolveIssuesPractice'; ======= import { ThinPullRequestsPractice } from './LanguageIndependent/ThinPullRequestsPractice'; >>>>>>> import { TimeToSolveIssuesPractice } from './LanguageIndependent/TimeToSolveIssuesPractice'; import { ThinPul...
<<<<<<< import { Paginated } from './common/Paginated'; import { PullCommits, PullFiles, PullRequest, Commit } from '../services/git/model'; ======= import { PullCommits, PullFiles, PullRequest } from '../services/git/model'; import { ListGetterOptions } from './common/ListGetterOptions'; import { Paginated } from '....
<<<<<<< let linterIssues: LinterIssueDto[] = []; ======= let pullRequests: PullRequestDto[] = []; >>>>>>> let linterIssues: LinterIssueDto[] = []; let pullRequests: PullRequestDto[] = []; <<<<<<< linterIssues = p.practice.data?.statistics?.linterIssues?.map((issue) => { ...
<<<<<<< const response = await service.getIssues('pypy', 'pypy', { filter: { state: IssueState.open } }); ======= const response = await service.listIssues('pypy', 'pypy'); >>>>>>> const response = await service.listIssues('pypy', 'pypy', { filter: { state: IssueState.open } });
<<<<<<< import { ICollaborationInspector } from './inspectors/ICollaborationInspector'; import { IIssueTrackingInspector } from './inspectors/IIssueTrackingInspector'; ======= import { PracticeContext } from './contexts/practice/PracticeContext'; import { packageJSONContents } from './detectors/__MOCKS__/JavaScript/p...
<<<<<<< import { ICVSService, BitbucketPullRequestState } from '../git/ICVSService'; import { BitbucketIssueState } from '../../inspectors/IIssueTrackingInspector'; ======= import { VCSService, IVCSService, BitbucketPullRequestState } from '../git/IVCSService'; import { ListGetterOptions } from '../../inspectors/comm...
<<<<<<< import { PHPLinterUsedPractice } from './PHP/PHPLinterUsedPractice'; ======= import { GoLinterUsedPractice } from './Go/GoLinterUsedPractice'; >>>>>>> import { GoLinterUsedPractice } from './Go/GoLinterUsedPractice'; import { PHPLinterUsedPractice } from './PHP/PHPLinterUsedPractice'; <<<<<<< PHPLinterUse...
<<<<<<< ======= //let resolver = 'Query: {\n'; >>>>>>> <<<<<<< //server.send(schema); stateSchema = schema; ======= server.send(schema); >>>>>>> //server.send(schema); stateSchema = schema;
<<<<<<< }, { title: 'Bottom Sheet', url: '/bottom-sheet', icon: 'home' ======= }, { title: 'App Bar', url: '/app-bar', icon: 'home' >>>>>>> }, { title: 'Bottom Sheet', url: '/bottom-sheet', icon: 'home' }, { title: 'App Bar'...
<<<<<<< public _parseMediaDeclaration(isNested: boolean = false): nodes.Node { ======= public _parseMediaDeclaration(isNested = false): nodes.Node | null { >>>>>>> public _parseMediaDeclaration(isNested: boolean = false): nodes.Node | null { <<<<<<< public _parseDetachedRuleSet(): nodes.Node { let mark = this...
<<<<<<< lbfgsInfo: LbfgsParams ): OptInfo => { ======= lbfgsInfo: LbfgsParams, varyingPaths: string[] ) => { >>>>>>> lbfgsInfo: LbfgsParams, varyingPaths: string[] ): OptInfo => {
<<<<<<< import { createModules } from './modules'; ======= import { Context } from './interfaces/Context'; import { ServerConfig } from './interfaces/ServerConfig'; import { createModules, pubSub } from './modules'; >>>>>>> import { Context } from './interfaces/Context'; import { ServerConfig } from './interfaces/Se...
<<<<<<< import { ConnectionArgs, createConnectionType } from '../../../utils/createConnectionType'; import { pubSub } from '../index'; ======= >>>>>>> import { pubSub } from '../index';
<<<<<<< let signedTx = await transport.call('Btc', 'createPaymentTransactionNew', inputs, paths, undefined, outputScriptHex, null, networksUtil[slip44].sigHash, segwit, undefined, additionals) ======= let signedTx = await transport.call('Btc', 'createPaymentTransactionNew', inputs, paths, undefined, outputScriptH...
<<<<<<< | BTCWallet | ETHWallet | CosmosWallet | BinanceWallet | RippleWallet | DebugLinkWallet; ======= | BTCWallet | ETHWallet | CosmosWallet | EosWallet | DebugLinkWallet; >>>>>>> | BTCWallet | ETHWallet | CosmosWallet | BinanceWallet | RippleWallet | EosWallet | DebugLinkWalle...
<<<<<<< public describePath (msg: DescribePath): PathDescription { return this.info.describePath(msg) } ======= public disconnect (): Promise<void> { return this.transport.disconnect() } >>>>>>> public describePath (msg: DescribePath): PathDescription { return this.info.describePath(msg) }...
<<<<<<< public describePath (msg: DescribePath): PathDescription { return this.info.describePath(msg) } ======= public disconnect (): Promise<void> { return this.transport.disconnect() } >>>>>>> public describePath (msg: DescribePath): PathDescription { return this.info.describePath(msg) ...
<<<<<<< DisconnectedDeviceDuringOperation = 'DisconnectedDeviceDuringOperation', ======= DeviceLocked = 'DeviceLocked', >>>>>>> DisconnectedDeviceDuringOperation = 'DisconnectedDeviceDuringOperation', DeviceLocked = 'DeviceLocked', <<<<<<< export class DisconnectedDeviceDuringOperation extends HDWal...
<<<<<<< export class LedgerHDWalletInfo implements core.HDWalletInfo, core.BTCWalletInfo, core.ETHWalletInfo { _supportsBTCInfo: boolean = true; _supportsETHInfo: boolean = true; _supportsCosmosInfo: boolean = false; // TODO ledger supports cosmos _supportsBinanceInfo: boolean = false; // TODO ledger supports...
<<<<<<< supportsRipple, supportsBinance, ======= supportsEos, EosPublicKeyKindMap, EosSignedTx, >>>>>>> supportsRipple, supportsBinance, supportsEos, EosPublicKeyKindMap, EosSignedTx, <<<<<<< Events, } from "@shapeshiftoss/hdwallet-core"; ======= Events, toHexString, } from "@shapeshifto...
<<<<<<< import { HDWallet, HDWalletInfo } from "@shapeshiftoss/hdwallet-core"; import { isKeepKey } from "@shapeshiftoss/hdwallet-keepkey"; import { isTrezor } from "@shapeshiftoss/hdwallet-trezor"; import { isLedger } from "@shapeshiftoss/hdwallet-ledger"; import { isPortis } from "@shapeshiftoss/hdwallet-portis"; im...
<<<<<<< describe('session.save(cb)', () => { it('should save session to store', async () => { const store = new MemoryStore() const getSession = SessionManager({ store, secret: 'test', }) const { fetch } = InitAppAndTest(async (req, res) => { const session = awai...
<<<<<<< ======= const tmpRect = new BoundingRect(0, 0, 0, 0); const viewRect = new BoundingRect(0, 0, 0, 0); function isDisplayableCulled(el: Displayable, width: number, height: number) { // Disable culling when width or height is 0 if (!width || !height) { return false; } tmpRect.copy(el.get...
<<<<<<< import { Dictionary, PropType, ElementEventName, ZRRawEvent, BuiltinTextPosition, AllPropTypes } from './core/types'; ======= import { Dictionary, PropType, ElementEventName, ZRRawEvent, AllPropTypes } from './core/types'; >>>>>>> import { Dictionary, PropType, ElementEventName, ZRRawEvent, BuiltinTextPositi...
<<<<<<< import { Path, IncrementalDisplayable, Rect } from '../export'; import Displayable from '../graphic/Displayable'; ======= import { Path, IncrementalDisplayable } from '../export'; import Displayable from '../graphic/Displayable'; >>>>>>> import { Path, IncrementalDisplayable } from '../export'; import Displa...
<<<<<<< getAnimationStyleProps() { ======= getWidth(): number { const style = this.style; const imageSource = style.image; if (isImageLike(imageSource)) { return (imageSource as HTMLImageElement).width; } if (!this.__image) { return 0; }...
<<<<<<< import { Path, IncrementalDisplayable, Rect } from '../export'; import Displayable from '../graphic/Displayable'; ======= import { Path, IncrementalDisplayable } from '../export'; import Displayable, { CommonStyleProps } from '../graphic/Displayable'; >>>>>>> import { Path, IncrementalDisplayable, Rect } fro...
<<<<<<< import Element, {ElementEventCallback} from './Element'; ======= import Element, {ElementEventCallback, ElementEvent} from './Element'; import CanvasPainter from './canvas/Painter'; >>>>>>> import Element, {ElementEventCallback, ElementEvent} from './Element'; <<<<<<< ======= import { StyleProps } from '....
<<<<<<< const rect = getBoundingRect( style.text + '', ======= const rect = textContain.getBoundingRect( text, >>>>>>> const rect = getBoundingRect( text,
<<<<<<< completionProvider: { resolveProvider: true, triggerCharacters: ['.', ':', '<', '"', '=', '/', '@'] }, ======= completionProvider: { resolveProvider: true, triggerCharacters: ['.', ':', '<', '"', '/'] }, >>>>>>> completionProvider: { resolveProvider: true, triggerCharacters: ['.', ':', '<',...
<<<<<<< } declare module 'eslint' { export interface ESLintError { ruleId: string; severity: number; message: string; line: number; column: number; nodeType: string; source: string; endLine?: number; endColumn?: number; } export interface Report { results...
<<<<<<< import { TextDocument } from 'vscode-languageserver-types'; import parseGitIgnore from 'parse-gitignore'; ======= import { TextDocument } from 'vscode-languageserver-textdocument'; import * as parseGitIgnore from 'parse-gitignore'; >>>>>>> import { TextDocument } from 'vscode-languageserver-textdocument'; im...
<<<<<<< node_navbar: { toggle: 'Toggle navigation', project_nav: 'Project Navigation', wiki: 'Wiki', analytics: 'Analytics', registrations: 'Registrations', files: 'Files', contributors: 'Contributors', addons: 'Add-ons', settings: 'Settings', ...
<<<<<<< ======= private async showServer(server: server.Server, displayServer: DisplayServer): Promise<void> { if (await server.isHealthy()) { // Sync the server display in case it was previously unreachable. await this.syncServerToDisplay(server); await this.showServerManagement(server, displ...
<<<<<<< const shadowsocksServer = new OutlineShadowsocksServer( getPersistentFilename('outline-ss-server/config.yml'), verbose, ssMetricsLocation) .enableCountryMetrics(MMDB_LOCATION); ======= const rollouts = createRolloutTracker(serverConfig); let shadowsocksServer: ShadowsocksServer...
<<<<<<< import { CPMouse } from './directive/cp-mouse'; ======= import { CPPlaceholder } from './directive/cp-placeholder'; >>>>>>> import { CPMouse } from './directive/cp-mouse'; import { CPPlaceholder } from './directive/cp-placeholder'; <<<<<<< cpTitles: [], cpMouse: [], ======= cpTitle...
<<<<<<< import { CPElse } from "./directive/cp-else"; import { CPElseIf } from "./directive/cp-else-if"; import { CPIf } from "./directive/cp-if"; import { CPInit } from "./directive/cp-init"; import { CPKey } from "./directive/cp-key"; import { CPMax } from "./directive/cp-max"; import { CPMaxLength } from "./directiv...