conflict_resolution
stringlengths
27
16k
<<<<<<< const nativeExtensions = ['node_sqlite3.node', 'fse.node', 'crfsuite.node', 'fasttext.node', 'node-svm.node'] ======= const nativeExtensions = ['node_sqlite3.node', 'fse.node', 'crfsuite.node', 'fasttext.node', 'sentencepiece.node'] >>>>>>> const nativeExtensions = [ 'node_sqlite3.node', 'fse.node', 'c...
<<<<<<< const collection = await this.slotExtractor.extract(text, intentDef, entities) const result: sdk.NLU.SlotCollection = {} for (const name of Object.keys(collection)) { if (Array.isArray(collection[name])) { result[name] = _.orderBy(collection[name], ['confidence'], ['desc'])[0] }...
<<<<<<< const { firstname, lastname, picture_url } = user.attributes ======= const { type } = await this.authService.getStrategy(strategy) const { firstname, lastname } = user.attributes >>>>>>> const { firstname, lastname, picture_url } = user.attributes const { type } = awai...
<<<<<<< import EntityService from './entities/entities-service' ======= import { isOn as isAutoTrainOn, set as setAutoTrain } from './autoTrain' import { deleteEntity, getCustomEntities, getEntities, getEntity, saveEntity, updateEntity } from './entities/entities-service' >>>>>>> import { isOn as isAutoT...
<<<<<<< this.app.use(`${BASE_API_PATH}/sdk`, this.sdkApiRouter.router) this.app.use(`/s`, this.shortlinksRouter.router) ======= this.app.use(`/s`, this.shortLinksRouter.router) >>>>>>> this.app.use(`${BASE_API_PATH}/sdk`, this.sdkApiRouter.router) this.app.use(`/s`, this.shortLinksRouter.router)
<<<<<<< allowStats: boolean /** * When this feature is enabled, fields saved as user attributes will be automatically erased when they expires. The timer is reset each time the value is modified * Setting a policy called "email": "30d" means that once an email is set, it will be removed in 30 days, unless it ...
<<<<<<< import Joi from 'joi' import Knex from 'knex' import _ from 'lodash' import nanoid from 'nanoid' ======= >>>>>>> import Joi from 'joi' import Knex from 'knex' import _ from 'lodash' import nanoid from 'nanoid' <<<<<<< import { AdminService } from './service' ======= import CoreAdminService, { AdminService...
<<<<<<< export const getCacheKeyInMinutes = (minutes: number = 1) => Math.round(new Date().getTime() / 1000 / 60 / minutes) /** Case-insensitive "startsWith" */ export const startsWithI = (a: string, b: string) => a.toLowerCase().startsWith(b.toLowerCase()) ======= export const getCacheKeyInMinutes = (minutes: numbe...
<<<<<<< export namespace kvs { export function get(botId: string, key: string, path?: string): Promise<any> export function set(botId: string, key: string, value: any, path?: string): Promise<void> export function setStorageWithExpiry(botId: string, key: string, value, expiryInMs?: string | number) ex...
<<<<<<< import { DialogSessionTable, GhostFilesTable, GhostRevisionsTable, LogsTable } from './bot-specific' ======= import { DialogSessionTable, LogsTable, NotificationsTable } from './bot-specific' >>>>>>> import { DialogSessionTable, GhostFilesTable, GhostRevisionsTable, LogsTable, NotificationsTable } from './bo...
<<<<<<< app.post('/tokenize', waitForServiceMw, async (req, res, next) => { ======= app.post('/vectorize', waitForServiceMw, validateLanguageMw, async (req, res, next) => { >>>>>>> app.post('/tokenize', waitForServiceMw, validateLanguageMw, async (req, res, next) => { <<<<<<< const result = await option...
<<<<<<< import { extractListEntities, extractPatternEntities } from './entities/custom-entity-extractor' import { BotCacheManager, getOrCreateCache } from './entities/entity-cache' ======= import { extractListEntities, extractPatternEntities, mapE1toE2Entity } from './entities/custom-entity-extractor' import { getSen...
<<<<<<< { name: 'ml', fileExtensions: ['ml', 'ML', 'mlton', 'sig', 'fun', 'cm', 'lex', 'grm'] }, ======= { name: 'capacitor', fileNames: ['capacitor.config.json'] }, { name: 'sketch', fileExtensions: ['sketch'] }, { name: 'adonis', fileNames: ['.adonisrc.json'] }, { ...
<<<<<<< /** * Files starting with a dot are disabled. This prefix means it was automatically disabled and * will be automatically re-enabled when the corresponding module is enabled in the future */ const DISABLED_PREFIX = '.__' ======= interface ModuleMigrationInstruction { /** exact name of the files to delet...
<<<<<<< const { utterance } = input ======= const { utterance, alternateUtterance } = input const sysEntities = (await tools.duckling.extract(utterance.toString(), utterance.languageCode)).map(mapE1toE2Entity) >>>>>>> const { utterance, alternateUtterance } = input
<<<<<<< { name: 'folder-mobile', folderNames: ['mobile', 'mobiles', 'portable'] }, { name: 'folder-terraform', folderNames: ['terraform'] }, ======= { name: 'folder-mobile', folderNames: ['mobile', 'mobiles', 'portable', 'portability'] }, { name: 'folder-stencil', folde...
<<<<<<< private readonly entityManager: EntityManager, ======= @Inject(forwardRef(() => RoleService)) private readonly roleService: RoleService, >>>>>>> private readonly entityManager: EntityManager, @Inject(forwardRef(() => RoleService)) private readonly roleService: RoleService,
<<<<<<< import { CertificateUserDTO } from '../dto/CertificateUserDTO'; import { CourseDTO } from 'src/CourseModule/dto'; ======= import { CourseDTO } from '../../CourseModule/dto'; >>>>>>> import { CertificateUserDTO } from '../dto/CertificateUserDTO'; import { CourseDTO } from '../../CourseModule/dto';
<<<<<<< $el: Dom7Array; /** Gauge generated SVH HTML element */ svgEl: HTMLElement; /** Dom7 instance with generated SVH HTML element */ $svgEl: Dom7Array; ======= $el : Dom7Instance /** Gauge generated SVG HTML element */ gaugeSvgEl : HTMLElement /** Dom7 instance with generated S...
<<<<<<< if (!isRelativeUrl(src) && !isSameOrigin(window.location.href, src)) { img.crossOrigin = 'anonymous' } if (typeof image === 'string') { img.src = src } return new Promise<ImageBase>((resolve, reject) => { ======= return new Bluebird<Ima...
<<<<<<< import { Injectable, Type } from '@nestjs/common'; import { ModuleRef } from '@nestjs/core'; import { Observable } from 'rxjs'; ======= import { Injectable, Type, OnModuleDestroy } from '@nestjs/common'; import { Observable, Subscription } from 'rxjs'; >>>>>>> import { Injectable, Type } from '@nestjs/common...
<<<<<<< import { Metatype } from '@nestjs/common/interfaces'; import { Component } from '@nestjs/common'; import { Observable } from 'rxjs/Observable'; ======= import { Injectable, Type } from '@nestjs/common'; import { EventObservable } from './interfaces/event-observable.interface'; import { Observable } from 'rxjs...
<<<<<<< green: 'rgb(76, 175, 80)', info_background: '#5A91BB', success_background: '#59A05E', danger_background: '#CA4A34', warning_background: '#D49538', ======= green: '#5AC36F', tab_border: '#4A90E2', >>>>>>> info_background: '#5A91BB', success_background: '#59A05E', danger_background: '#CA4A3...
<<<<<<< this.ignoreOnboarding = data[8][1] ? moment(data[8][1]) : false; this.dataSaverMode = data[9][1] || false; this.dataSaverModeDisablesOnWiFi = data[10][1] || false; ======= this.ignoreOnboarding = data[8][1] ? moment(parseInt(data[8][1], 10)) : false; >>>>>>> this.ignoreOnboard...
<<<<<<< 'IgnoreBestLanguage', ======= 'ComposerMode', >>>>>>> 'IgnoreBestLanguage', 'ComposerMode', <<<<<<< this.ignoreBestLanguage = data[6][1] || ''; ======= this.composerMode = data[6][1] || 'photo'; >>>>>>> this.ignoreBestLanguage = data[6][1] || ''; this.composerMode ...
<<<<<<< 'DataSaverMode', 'DataSaverModeDisablesOnWiFi', ======= 'SwipeAnimShown', >>>>>>> 'DataSaverMode', 'DataSaverModeDisablesOnWiFi', 'SwipeAnimShown',
<<<<<<< import { SwipeDirection } from "./swipe-direction"; import { Locator } from "./locators"; ======= import { Direction } from "./direction"; >>>>>>> import { Direction } from "./direction"; import { Locator } from "./locators";
<<<<<<< const collectionOption = options.find(option => option.name === 'collection' && option.value != null); // @ts-ignore const collectionName: any = collectionOption.value; await generateApplicationFiles( inputs, options, isDryRunEnabled as boolean, collectionName, ).c...
<<<<<<< const recordAddresses = await this.getRecordsAddresses(domain); if (!recordAddresses) return null; const [ownerAddress, resolverAddress] = recordAddresses; const resolution = await this.getResolverRecordsStructure(resolverAddress); ======= const recordAddresses = await this._getRecordsAddr...
<<<<<<< import { valueOrDefault, transformOrDefault } from '../utils/check'; ======= import { valueOrDefault } from '../utils/check'; import { StorageService } from '../services/storage'; >>>>>>> import { valueOrDefault, transformOrDefault } from '../utils/check'; import { StorageService } from '../services/storage'...
<<<<<<< import { transformOrDefault } from '../utils/check'; import { CoinModel } from './coin'; import { WalletAddressModel } from './walletAddress'; ======= import { CoinStorage } from './coin'; import { WalletAddressStorage } from './walletAddress'; >>>>>>> import { CoinStorage } from './coin'; import { transform...
<<<<<<< lite: boolean; ======= tokens?: Array<any>; >>>>>>> lite: boolean; tokens?: Array<any>; <<<<<<< xPubKey, pubKey ======= xPubKey: hdPrivKey.xpubkey, pubKey, tokens: [] >>>>>>> xPubKey: hdPrivKey.xpubkey, pubKey, tokens: [] <<<<<<< if (!lite) { ...
<<<<<<< .option('-c, --config [path]', 'Path to nest-cli configuration file') .option('-p, --path [path]', 'Path to tsconfig file') .option('-w, --watch', 'Run in watch mode (live-reload)') .option('--webpack', 'Use webpack for compilation') .option('--webpackPath [path]', 'Path to webpack...
<<<<<<< ======= async getWalletAddresses(walletId: ObjectID) { let query = { chain: this.chain, wallet: walletId }; return WalletAddressStorage.collection .find(query) .addCursorFlag('noCursorTimeout', true) .toArray(); } >>>>>>>
<<<<<<< import { Component, EventEmitter, Injectable, Input, Output } from '@angular/core'; import { Http } from '@angular/http'; ======= import { Component, EventEmitter, Input, Output } from '@angular/core'; >>>>>>> import { Component, EventEmitter, Injectable, Input, Output } from '@angular/core'; <<<<<<< import...
<<<<<<< import { TransactionJSON } from '../../../types/Transaction'; import { IBlock } from '../../../models/baseBlock'; ======= import { Validation } from 'crypto-wallet-core'; >>>>>>> import { Validation } from 'crypto-wallet-core'; import { TransactionJSON } from '../../../types/Transaction'; import { IBlock } f...
<<<<<<< it('should build a test pipe file name', () => { expect( builder .addName('name') .addAsset(AssetEnum.PIPE) .addTest(false) .addExtension('ts') .build() ).to.be.equal('name.pipe.ts'); }); ======= it('shou...
<<<<<<< baseUrl = baseUrl || '/v5/txproposals/'; ======= // baseUrl = baseUrl || '/v4/txproposals/'; // DISABLED 2020-04-07 baseUrl = '/v3/txproposals/'; >>>>>>> baseUrl = baseUrl || '/v4/txproposals/'; // baseUrl = baseUrl || '/v4/txproposals/'; // DISABLED 2020-04-07 <<<<<<< base = ba...
<<<<<<< private async requestWithParams({ method, path, payload, urlParams, queryParams, catchNotFound, payloadKey, }: { method: string; path: string; payload: any; urlParams: any; queryParams?: Record<string, any> | null; catchNotFound: boolean; payloadKey?: ...
<<<<<<< public getSessionCount = this.makeRequest<{id: string}, {count: number}>({ ======= public getSessionCount = this.makeRequest< {id: string}, {'count': number} >({ >>>>>>> public getSessionCount = this.makeRequest<{id: string}, {count: number}>({ <<<<<<< public getOfflineSessionCount = this....
<<<<<<< import { sleep, getWaitForFn, nextIdle } from '../../core/utils'; import { mergeScreenshotOptions } from '../../screenshot-options'; import { hoc } from './hoc'; ======= import { sleep } from '../../core/utils'; >>>>>>> import { getWaitForFn, nextIdle, sleep } from '../../core/utils'; <<<<<<< const withScre...
<<<<<<< import { UseractivityListComponent } from './modules/useractivity/useractivity-list/useractivity-list.component'; ======= import { SwitchupdatemodalComponent } from './common/components/switchupdatemodal/switchupdatemodal.component'; >>>>>>> import { UseractivityListComponent } from './modules/useractivity/u...
<<<<<<< onCustomRender?: (field: ICustomCollectionField, value: any, onUpdate: (fieldId: string, value: any) => void, item: any) => JSX.Element; ======= onCustomRender?: (field: ICustomCollectionField, value: any, onUpdate: (fieldId: string, value: any) => void, rowUniqueId: string) => JSX.Element; >>>>>>> onC...
<<<<<<< import { PropertyFieldSliderWithCallout } from '../../PropertyFieldSliderWithCallout'; import { PropertyFieldChoiceGroupWithCallout } from '../../PropertyFieldChoiceGroupWithCallout'; ======= import { PropertyFieldButtonWithCallout } from '../../PropertyFieldButtonWithCallout'; import { PropertyFieldCheckboxW...
<<<<<<< import { ZabbixMetricsQuery } from './types'; ======= import * as c from './constants'; >>>>>>> import { ZabbixMetricsQuery } from './types'; import * as c from './constants';
<<<<<<< type ThunkAction = (dispatch: Redux.Dispatch, getState: () => State) => void; ======= export interface Action { type: symbol; item?: Item; items?: Item[]; text?: string; msg_kind?: MessageKind; tweet_id?: string; status?: Tweet; statuses?: Tweet[]; user?: TwitterUser; u...
<<<<<<< import { Engine, PhotonError, PhotonQueryError, QueryEngineError } from './Engine' import got, { Got } from 'got' ======= import { Engine, PrismaClientError, PrismaClientQueryError, QueryEngineError } from './Engine' import got from 'got' >>>>>>> import { Engine, PrismaClientError, PrismaClientQueryError, Qu...
<<<<<<< function getModules(targetPath: string): Module[] { ======= function walk(dir: string, recursive: boolean): string[] { /* Source: http://stackoverflow.com/a/5827895 */ let results: string[] = []; let list = readdirSync(dir); let i = 0; (function next() { let file = list[i++]; ...
<<<<<<< @observable notificationListAnchor: null | HTMLElement = null; @observable notificationList: Notification[] = []; @action setNotificationList(list: Notification[]) { this.notificationList = list; } @action setNotificationListAnchor(el: HTMLElement | null) { this.notificationListAnchor = ...
<<<<<<< @prototypeValue(Mixin([ CalculationSync, Quark, Map ], IdentityMixin<CalculationSync & Quark & Map<any, any>>())) ======= @prototypeValue(true) sync : boolean @prototypeValue(buildClass(Map, CalculationSync, Quark)) >>>>>>> @prototypeValue(true) sync : b...
<<<<<<< import { Base } from "../class/BetterMixin.js" ======= import { AnyConstructor, Base, Mixin } from "../class/Mixin.js" import { DEBUG } from "../environment/Debug.js" import { cycleInfo, OnCycleAction, WalkStep } from "../graph/WalkDepth.js" >>>>>>> import { Base } from "../class/BetterMixin.js" import { DEB...
<<<<<<< import { Base } from "../../src/class/BetterMixin.js" ======= import { ProposedOrCurrent } from "../../src/chrono/Effect.js" import { Base } from "../../src/class/Mixin.js" >>>>>>> import { ProposedOrCurrent } from "../../src/chrono/Effect.js" import { Base } from "../../src/class/BetterMixin.js"
<<<<<<< //----------------------------------- // example3 import { ChronoIterator, ChronoGraph } from "../src/chrono/Graph.js" ======= const identifier2 = Identifier.new({ calculation : (Y : SyncEffectHandler) => Y(identifier1) + 5 }) >>>>>>> const identifier2 = Identifier.new({ calculation : (Y : SyncEffectHandler...
<<<<<<< import { copySetInto } from "../util/Helpers.js" ======= import { clearLazyProperty, copySetInto, isGeneratorFunction, lazyProperty } from "../util/Helpers.js" >>>>>>> import { clearLazyProperty, copySetInto, isGeneratorFunction, lazyProperty } from "../util/Helpers.js" <<<<<<< this.$followingRe...
<<<<<<< import { Checkout } from "../chrono/Checkout.js" import { CalculatedValueGen, Identifier } from "../chrono/Identifier.js" import { AnyConstructor, Mixin } from "../class/BetterMixin.js" ======= import { CheckoutI } from "../chrono/Checkout.js" import { CalculatedValueGen, CalculatedValueSync, Identifier, Vari...
<<<<<<< return this._activeTransaction = Transaction.new({ ======= return this.$activeTransaction = MinimalTransaction.new({ >>>>>>> return this.$activeTransaction = Transaction.new({
<<<<<<< import { Base } from "../class/BetterMixin.js" import { NOT_VISITED, OnCycleAction, VISITED_TOPOLOGICALLY, WalkSource } from "../graph/WalkDepth.js" ======= import { Base } from "../class/Mixin.js" import { NOT_VISITED, OnCycleAction, VISITED_TOPOLOGICALLY } from "../graph/WalkDepth.js" >>>>>>> import { Base...
<<<<<<< describe('given only enforced content type', () => { test('and that content type exists should first 200 static example', async () => { const response = await mocker.mock({ resource: httpOperations[0], input: httpRequests[0], config: { mock: { ...
<<<<<<< import { configMergerFactory, IFilesystemLoaderOpts } from '@stoplight/prism-core'; import { createInstance, IHttpMethod, TPrismHttpInstance } from '@stoplight/prism-http'; ======= import { createInstance, IHttpMethod } from '@stoplight/prism-http'; import { TPrismHttpInstance } from '@stoplight/prism-http/ty...
<<<<<<< import { IPrismInput, ValidationSeverity } from '@stoplight/prism-core/types'; import { IHttpMethod, IHttpRequest, IHttpResponse } from '@stoplight/prism-http/types'; ======= import { IPrismInput, ValidationSeverity } from '@stoplight/prism-core'; import { IHttpMethod, IHttpRequest } from '@stoplight/prism-ht...
<<<<<<< const iconStart = await page.find( "calcite-link >>> .calcite-link--icon.icon-start" ); const iconEnd = await page.find( "calcite-link >>> .calcite-link--icon.icon-end" ); expect(element).toHaveClass("hydrated"); ======= const icon = await page.find("calcite-link >>> .calc...
<<<<<<< { components: ["calcite-tree", "calcite-tree-item"] }, { components: ["calcite-card"] }, { components: ["calcite-icon"] } ======= { components: ["calcite-tooltip"] }, { components: ["calcite-tree", "calcite-tree-item"] } >>>>>>> { components: ["calcite-tooltip"] }, { components: [...
<<<<<<< `<style>.hydrated--invisible {visibility: hidden;}</style><calcite-popover placement="auto" reference-element="ref">content</calcite-popover><calcite-popover-manager><div id="ref">referenceElement</div></calcite-popover-manager>` ======= `<calcite-popover placement="auto" reference-element="ref" a...
<<<<<<< import { registerHiringTypes } from './hiring'; import { Codec } from '@polkadot/types/types'; ======= import { registerVersionedStoreTypes } from './versioned-store'; import { registerVersionedStorePermissionsTypes } from './versioned-store/permissions'; >>>>>>> import { registerHiringTypes } from './hiring...
<<<<<<< const opening = new WorkingGroupOpening() opening.setMaxActiveApplicants(new BN(m1KeyPairs.length)) opening.setMaxReviewPeriodLength(new BN(32)) opening.setApplicationStakingPolicyAmount(new BN(applicationStake)) opening.setApplicationCrowdedOutUnstakingPeriodLength(new BN(1)) opening.setApplication...
<<<<<<< ======= SavedEntityEvent, makeDatabaseManager, SubstrateEvent, >>>>>>>
<<<<<<< defaultWorkingGroup: WorkingGroups ======= metadataCache: Record<string, any> >>>>>>> defaultWorkingGroup: WorkingGroups metadataCache: Record<string, any> <<<<<<< defaultWorkingGroup: WorkingGroups.StorageProviders, ======= metadataCache: {}, >>>>>>> defaultWorkingGroup: WorkingGroups.Stor...
<<<<<<< private static connectDataSource(sourceDS: IDataSource) { // Connect sources and dependencies sourceDS.store.listen((state) => { Object.keys(this.dataSources).forEach(checkDSId => { var checkDS = this.dataSources[checkDSId]; var dependencies = checkDS.plugin.getDependencies() ||...
<<<<<<< async getBlockHash(blockNumber?: BlockNumber | Uint8Array | number | string) { debug(`Fetching block hash: BlockNumber: ${blockNumber}`) ======= getBlockHash(blockNumber?: BlockNumber | Uint8Array | number | string): Promise<Hash> { >>>>>>> async getBlockHash(blockNumber?: BlockNumber | Uint8Array ...
<<<<<<< WorkerApplication, WorkerApplicationId, WorkerOpening, WorkerOpeningId } from '@joystream/types/working-group'; ======= WorkerApplication, WorkerApplicationId, WorkerOpening, WorkerOpeningId, Worker, WorkerId, WorkerRoleStakeProfile, Lead as LeadOf } from '@joystream/types/bureaucracy'; >>>>>>> ...
<<<<<<< import { DataSourceConnector } from '../../DataSourceConnector'; import * as formats from '../../../utils/data-formats'; ======= import { DataSourceConnector, IDataSource } from '../../DataSourceConnector'; >>>>>>> import { DataSourceConnector, IDataSource } from '../../DataSourceConnector'; import * as form...
<<<<<<< type FormattedCategory = { handle: string; id: string; title: string; items: { id: string; title: string }[]; }[]; function formatCategories(rootCategory: CommerceTypes.Category): FormattedCategory { return (rootCategory.categories || []).map(subCategory => ({ ======= export function formatCategori...
<<<<<<< // attach write method this._writeMethod = (data: string) => this._defer(() => this._agent.inSocket.write(data)); ======= this._forwardEvents(); >>>>>>> this._forwardEvents(); // attach write method this._writeMethod = (data: string) => this._defer(() => this._agent.inSocket.write...
<<<<<<< /** * Whether to enable flow control handling (false by default). If enabled a message of `flowControlPause` * will pause the socket and thus blocking the slave program execution due to buffer back pressure. * A message of `flowControlResume` will resume the socket into flow mode. * For ...
<<<<<<< const args = definition.constructorArgs.map(val => (val as ManagedReference).name); if (args.indexOf(identifier) > -1) { return true; } const keys = definition.properties.keys(); if (keys.indexOf(identifier) > -1) { return true; } for (const key of keys) { let subDe...
<<<<<<< import { MatProgressButtonsModule } from 'mat-progress-buttons'; ======= import { MatModule } from './mat-module'; >>>>>>> import { MatModule } from './mat-module'; import { MatProgressButtonsModule } from 'mat-progress-buttons'; <<<<<<< MatProgressButtonsModule.forRoot(), ======= MatModule, >>>>...
<<<<<<< this.dataSource.filterPredicate = this.filterListItem; ======= this.dataSource.filterPredicate = ( item: AddonViewModel, filter: string ) => { if ( stringIncludes(item.addon.name, filter) || stringIncludes(item.addon.latestVersion, ...
<<<<<<< import { app, BrowserWindow, screen, BrowserWindowConstructorOptions, Tray, Menu, nativeImage, ipcMain, MenuItem, MenuItemConstructorOptions } from 'electron'; import * as path from 'path'; import * as url from 'url'; import * as fs from 'fs'; import { release, arch } from 'os'; import * as electronDl from 'ele...
<<<<<<< import { WowUpService } from "app/services/wowup/wowup.service"; import { defaultChannelKeySuffix } from "../../../constants"; import { getEnumName } from "app/utils/enum.utils"; import { AddonChannelType } from "app/models/wowup/addon-channel-type"; ======= import { GetAddonListItem } from "app/business-obje...
<<<<<<< public title: string = 'TITLE.CLICKER_LIST'; ======= public title: string; public version: string; >>>>>>> public title: string; public version: string; <<<<<<< ======= this.title = 'Clickers'; this.version = version; >>>>>>> this.version = version;
<<<<<<< var startMinimized = (process.argv || []).indexOf('--hidden') !== -1; if (!startMinimized) win.show(); autoUpdater.checkForUpdatesAndNotify().then((result) => { console.log("UPDATE", result); }); ======= win.show(); >>>>>>> var startMinimized = (process.argv || []).indexOf...
<<<<<<< var autoLaunch = require("auto-launch"); ======= const autoLaunch = require("auto-launch"); >>>>>>> const autoLaunch = require("auto-launch"); <<<<<<< private _fileService: FileService ======= private _fileService: FileService, >>>>>>> private _fileService: FileService, <<<<<<< this._el...
<<<<<<< savedData[id].date = new Date(savedData[id].date).toString(); return savedData[id]; }); ======= const matchesList: InternalMatch[] = newMatchesIndex .filter( (id: string) => savedData[id] && savedData[id].gameStats?.length > 0 && savedData[id]?.gameStats[0] !== un...
<<<<<<< let nodeModule = path.join(vscode.workspace.rootPath, "node_modules", "flexjs"); if(validateFrameworkSDK(nodeModule)) ======= let flexjsModule = path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "node_modules", "flexjs"); if(validateFrameworkSDK(flexjsModule)) >>>>>>> let nodeModule = path.join...
<<<<<<< let browserViews: BrowserView[] = (global['browserViews'] = global['browserViews'] || []) as BrowserView[]; ======= const browserViews: Electron.BrowserView[] = []; >>>>>>> const browserViews: BrowserView[] = (global['browserViews'] = global['browserViews'] || []) as BrowserView[];
<<<<<<< private getNodesPromise(folder: string, opts?: any) { let alfrescoClient = this.getAlfrescoClient(); let apiInstance = new AlfrescoApi.Core.NodesApi(alfrescoClient); ======= private getNodesPromise(folder: string) { >>>>>>> private getNodesPromise(folder: string, opts?: any) { <<...
<<<<<<< import { AlfrescoTranslateService } from 'ng2-alfresco-core'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist'; ======= import { AlfrescoTranslationService } from 'ng2-alf...
<<<<<<< import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core'; import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; ======= import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { DataTableModule, ObjectDataRow, ...
<<<<<<< import { ActivitiDemoComponent } from './components/activiti/activiti-demo.component'; ======= import { WebscriptComponent } from './components/webscript/webscript.component'; >>>>>>> import { ActivitiDemoComponent } from './components/activiti/activiti-demo.component'; import { WebscriptComponent } from './...
<<<<<<< import { Schemas as Interfaces } from '../lib/interfaces' ======= import { Schemas } from '../lib/interfaces' import { logger } from '../lib/logger' >>>>>>> import { Schemas as Interfaces } from '../lib/interfaces' import { logger } from '../lib/logger' <<<<<<< export async function list( /** A Postgres c...
<<<<<<< document.addEventListener('browserplugin.from.extension.fnd.opened', (event: CustomEvent) => { Utils.openedByBrowserplugin = true; }); ======= this.passGetParams(); >>>>>>> this.passGetParams(); document.addEventListener('browserplugin.from.extension.fnd...
<<<<<<< import {TypedEventEmitter} from "TypedEventEmitter"; import {Batcher} from "batcher"; ======= import {Publisher, Subscriber as RealSubscriber} from "pubsub"; // The player cache's Subscriber is just like a vanilla Subscriber, but can // subscribe to and unsubscribe from numerical ids or whole Players. The //...
<<<<<<< const { newSource, position } = getCaretPositionFromSource(source); if (!position) { fail(); } let sources = newSource; if (!dontAddModuleDeclaration) { // Add the module header and account for it in the cursor position sources = ["module Test exposing (..)", "", ...newS...
<<<<<<< import { Plugin, OutputOptions } from 'rollup'; import { Middleware } from 'polka'; export type Mode = 'start' | 'serve' | 'build'; export { Middleware }; export type OutputOption = OutputOptions | ((opts: OutputOptions) => OutputOptions); export interface Options { prod: boolean; mode: Mode; cwd: string...
<<<<<<< import { VimOption, BufferEvent, HyperspaceCoordinates, BufferType, BufferHide, BufferOption, Color, Buffer, Window, Tabpage, GenericCallback } from '../neovim/types' ======= import { VimMode, VimOption, BufferEvent, HyperspaceCoordinates, BufferType, BufferHide, BufferOption, Color, Buffer, Window, Tabpage, ...
<<<<<<< export enum SyncKind { None, Full, Incremental } const servers = new Map<string, extensions.RPCServer>() const serverCapabilities = new Map<string, any>() ======= const servers = new Map<string, extensions.LanguageServer>() >>>>>>> export enum SyncKind { None, Full, Incremental } const servers = new Map<st...
<<<<<<< export { ThemeProvider } from './components/ThemeProvider'; export { FormBlock } from './components/Form'; ======= export { ThemeProvider } from './components/ThemeProvider'; export { WrapperTag } from './components/WrapperTag'; >>>>>>> export { ThemeProvider } from './components/ThemeProvider'; export { For...
<<<<<<< import {Driver, DRIVERS, determineDriver} from './Driver' ======= import {Driver} from './Driver' import {PollyfillDriver} from './PolyfillDriver' import {MemoryStorage} from './MemoryStorage' import {CookieStorage} from './CookieStorage' >>>>>>> import {Driver, determineDriver} from './Driver' import {Polly...
<<<<<<< import { ERC20Token, OKB_ADDRESS, DAI_ADDRESS } from './token' ======= import { ERC20TokenPredefinedData, DAI_ADDRESS } from './erc20' >>>>>>> import { ERC20Token, DAI_ADDRESS } from './token'
<<<<<<< import { OtherDetailsComponent } from './components/user/user-settings/other-details/other-details.component'; ======= import { AppEffectsModule } from './effects/index'; import { ComponentsModule } from './components/index'; import { SharedModule } from './shared/index'; import { CanActivateViaAuthGuard ...