conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
>>>>>>> |
<<<<<<<
INotebookServer,
=======
INotebookProvider,
>>>>>>>
INotebookProvider,
INotebookServer, |
<<<<<<<
=======
const rewireConsole = false;
>>>>>>>
<<<<<<<
// rewireConsole = true;
=======
//rewireConsole = true;
>>>>>>> |
<<<<<<<
import * as utils from '../../shared/utils';
=======
import * as utils from '../utils/utils';
import * as m3u from '../utils/utils-m3u';
>>>>>>>
import * as utils from '../../shared/utils';
import * as m3u from '../utils/utils-m3u'; |
<<<<<<<
return variableLengthCompare(a, b) * -1;
=======
return getVariableCharacters(a).length >= getVariableCharacters(b).length ? -1 : 1;
>>>>>>>
return variableLengthCompare(a, b) * -1;
<<<<<<<
=======
function shuffleCompare(): number {
return Math.random() >= 0.5 ? 1 : -1;
}
>>>>>>>
function shuff... |
<<<<<<<
while (!args.endpoint || args.endpoint.length == 0) {
args.endpoint = readline.question(`What localhost endpoint does your bot use for debugging [Example: http://localhost:3978/api/messages]? `, {
defaultInput: ' '
=======
while (!args.endpoint || args.endpoint.length === 0) {
... |
<<<<<<<
import { BotConfiguration, IQnAService, QnaMakerService } from 'botframework-config';
=======
// tslint:disable:no-console
>>>>>>>
// tslint:disable:no-console
import { BotConfiguration, IQnAService, QnaMakerService } from 'botframework-config'; |
<<<<<<<
reconnectRepl("clj", cljSession);
=======
>>>>>>>
reconnectRepl("clj", cljSession);
<<<<<<<
let err = [];
let out = [];
let result = newCljsSession.eval(initCode, { stdout: x => { out.push(util.stripAnsi(x)); chan.append(util... |
<<<<<<<
=======
import { saveAs } from 'file-saver';
>>>>>>>
<<<<<<<
=======
// This method has been adapted from Stack Overflow
// Question: http://stackoverflow.com/questions/35368633/angular-2-download-pdf-from-api-and-display-it-in-view
// Answer by spock: http://stackoverflow.com/users/435743/spock
>>... |
<<<<<<<
| 'interestDepositForm'
| 'interestWithdrawalForm'
=======
| 'linkedCards'
>>>>>>>
| 'interestDepositForm'
| 'interestWithdrawalForm'
| 'linkedCards' |
<<<<<<<
SDDEligibleType,
SDDVerifiedType,
=======
SwapQuoteType,
>>>>>>>
SDDEligibleType,
SDDVerifiedType,
SwapQuoteType, |
<<<<<<<
| InitalizeDepositModalAction
| InitializeInterestAction
=======
| InitializeInterestAction
| SetInterestStep
| ShowInterestModal
>>>>>>>
| InitalizeDepositModalAction
| InitializeInterestAction
| SetInterestStep
| ShowInterestModal |
<<<<<<<
CustodialProductType,
=======
NabuCustodialProductType,
PaymentDepositPendingResponseType,
>>>>>>>
CustodialProductType,
NabuCustodialProductType,
PaymentDepositPendingResponseType,
<<<<<<<
withdrawFunds,
getWithdrawalFees
=======
notifyNonCustodialToCustodialTransfer,
withdraw... |
<<<<<<<
//Blockchain Loader is done
export const BlockchainLoader: StatelessComponent<{
width?: string
height?: string
}>
//Button is done
export const Button: StatelessComponent<{
nature?:
| 'copy'
| 'dark'
| 'empty-secondary'
| 'empty'
| 'gray-3'
| 'green'
| 'light'
| 'primary'
... |
<<<<<<<
export const INTIALIZE_DEPOSIT_MODAL = '@EVENT.INTIALIZE_DEPOSIT_MODAL'
=======
export const SHOW_INTEREST_MODAL = '@EVENT.SHOW_INTEREST_MODAL'
export const SET_INTEREST_STEP = '@EVENT.SET_INTEREST_STEP'
>>>>>>>
export const INTIALIZE_DEPOSIT_MODAL = '@EVENT.INTIALIZE_DEPOSIT_MODAL'
export const SHOW_INTERES... |
<<<<<<<
export const SET_FAST_LINK = '@EVENT.SET_FAST_LINK'
export const SET_FIAT_CURRENCY = '@EVENT.SET_FIAT_CURRENCY'
=======
>>>>>>>
export const SET_FIAT_CURRENCY = '@EVENT.SET_FIAT_CURRENCY' |
<<<<<<<
.map(x => ({ ...x.XLM, address: accountAddress.data }))
=======
.map(
x =>
x.XLM && {
...x.XLM,
address: accountAddress ? accountAddress.data : null
}
)
>>>>>>>
.map(x => ({
...x.XLM,
... |
<<<<<<<
export * from './modals/types'
export * from 'blockchain-wallet-v4/src'
=======
>>>>>>>
export * from './modals/types' |
<<<<<<<
sddEligable: Remote.NotAsked,
step: 'CURRENCY_SELECTION'
=======
step: 'CRYPTO_SELECTION'
>>>>>>>
sddEligable: Remote.NotAsked,
step: 'CRYPTO_SELECTION' |
<<<<<<<
switch (coin) {
=======
switch (ownProps.coin) {
case 'BCH':
return selectors.core.common.bch.getAccountsBalances(state)
>>>>>>>
switch (coin) {
case 'BCH':
addressDataR = getBchAddressData(state, {
excludeLockbox: true,
excludeImported: true,
includeCustodia... |
<<<<<<<
.map(x => ({ ...x.ETH, address: accountAddress.data }))
=======
.map(
x =>
x.ETH && {
...x.ETH,
address: accountAddress ? accountAddress.data : null
}
)
>>>>>>>
.map(x => ({
... |
<<<<<<<
const emailVerifiedR = selectors.core.settings.getEmailVerified(state)
const sbOrdersR = selectors.components.simpleBuy.getSBOrders(state)
const sddEligibleR = selectors.components.simpleBuy.getSddEligible(state)
// checks orderType on state for the 'SELL' button on top of actitivity feed
=======
//... |
<<<<<<<
const result = await reducer(beforeMiddleswaresResult, ...params);
if (result === false) {
PLATFORM.performance.clearMarks();
PLATFORM.performance.clearMeasures();
=======
const apply = async (newState: T) => {
let resultingState = await this.executeMiddlewares(
newState,... |
<<<<<<<
export * from '../network/api/sdd/types'
=======
export * from '../network/api/swap/types'
>>>>>>>
export * from '../network/api/sdd/types'
export * from '../network/api/swap/types' |
<<<<<<<
=======
rates: ExtractSuccess<typeof ratesR>,
>>>>>>>
rates: ExtractSuccess<typeof ratesR>,
<<<<<<<
=======
payment: paymentR.getOrElse(undefined),
rates,
>>>>>>>
rates,
<<<<<<<
)(
cardsR,
quoteR,
sbBalancesR,
userDataR,
sddEligibleR,
sddLimitR,
... |
<<<<<<<
import { call, CallEffect, put, select } from 'redux-saga/effects'
import { head, nth } from 'ramda'
=======
import { call, put, select } from 'redux-saga/effects'
>>>>>>>
import { call, put, select } from 'redux-saga/effects'
import { head, nth } from 'ramda'
<<<<<<<
import {
INVALID_COIN_TYPE,
NO_DEFA... |
<<<<<<<
...coinify({ coinifyUrl, ...http }),
...delegate({ rootUrl, apiUrl, ...http }),
...eth({ apiUrl, ...http }),
=======
...eth({ rootUrl, apiUrl, ...http }),
>>>>>>>
...eth({ apiUrl, ...http }), |
<<<<<<<
interface InputOutput {
id: number
address_hash: string
capacity: number
from_cellbase: boolean
target_block_number: number
block_reward: number
secondary_reward: number
commit_reward: number
proposal_reward: number
isGenesisOutput: boolean
}
=======
>>>>>>> |
<<<<<<<
}
export const fetchStatisticTxFeeHistory = () => {
return axiosIns(`/daily_statistics/total_tx_fee`).then((res: AxiosResponse) =>
toCamelcase<Response.Response<Response.Wrapper<State.StatisticTransactionFee>[]>>(res.data),
)
}
export const fetchStatisticBlockTimeDistribution = () => {
return axiosI... |
<<<<<<<
import * as ReactDOM from 'react-dom';
import * as Backbone from 'backbone';
=======
>>>>>>>
import * as ReactDOM from 'react-dom'; |
<<<<<<<
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { File, FileEntry } from '@ionic-native/file';
=======
import { Injectable } from '@angular/core';
import { File, FileEntry } from '@ionic-native/file';
import { HttpClient } fr... |
<<<<<<<
logger.log(
chalk.grey(`Building Lambda function ${getHandlerCopy(srcPath, handler)}`)
=======
console.log(
chalk.grey(
`Building Lambda function ${getHandlerFullPosixPath(srcPath, handler)}`
)
>>>>>>>
logger.log(
chalk.grey(
`Building Lambda function ${getHandlerFullPosixPa... |
<<<<<<<
import {
Observable,
BehaviorSubject,
Subscriber,
Subscription,
Observer
} from "rxjs";
=======
/**
* @license BSD-3-Clause
*
* Copyright (c) 2019 Project Jupyter Contributors.
* Distributed under the terms of the 3-Clause BSD License.
*/
import { Observable, BehaviorSubject, Subscriber, Subsc... |
<<<<<<<
ja: '言語を選択してください。',
=======
ro: 'Te rog, salectează limba.',
>>>>>>>
ja: '言語を選択してください。',
ro: 'Te rog, salectează limba.',
<<<<<<<
ja: 'はい、私は日本語が喋れます。',
=======
ro: 'Perfect, acum vorbesc Română.',
>>>>>>>
ja: 'はい、私は日本語が喋れます。',
ro: 'Perfect, acum vorbesc Română.',
<<<<<<<
... |
<<<<<<<
const ROOM_ID_PREANGEL = '17237607145@chatroom' // ChatOps - PreAngel
const ROOM_ID_CHATBOT_0_1 = '22598372108@chatroom' // 博文视点《Chatbot从0到1》读者群
const ROOM_ID_JAVASCRIPT_ML = '4383052528@chatroom' // Machine Learning in JavaScript
=======
const ROOM_ID_PREANGEL = '17237607145@chatroom' ... |
<<<<<<<
if (owner === 'juzibot' && repository === 'Juzi-WeChat-Work-Tasks') {
const wxBotUrl = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send'
const key = '974db6af-6b24-41aa-8da6-5ed634d24fcf'
const options = {
body: {
markdown: {
content: `[${urlLinkPayload.title}](${url... |
<<<<<<<
import { Controller, Get, Post, Body, Param, Delete, Patch, UsePipes, ValidationPipe } from '@nestjs/common';
=======
import { Controller, Get, Post, Body, Param, Delete, Patch, Query } from '@nestjs/common';
>>>>>>>
import { Controller, Get, Post, Body, Param, Delete, Patch, Query, UsePipes, ValidationPipe ... |
<<<<<<<
import { PanModifier } from './panmodifier';
import { PinchZoomModifier } from './pinchzoommodifier';
=======
import { TouchEventProvider } from './toucheventprovider';
>>>>>>>
import { PanModifier } from './panmodifier';
import { PinchZoomModifier } from './pinchzoommodifier';
<<<<<<<
/* Create eve... |
<<<<<<<
export { EnvironmentRenderingPass, EnvironmentTextureType } from './environmentrenderingpass';
=======
export { DebugPass } from './debugpass';
>>>>>>>
export { DebugPass } from './debugpass';
export { EnvironmentRenderingPass, EnvironmentTextureType } from './environmentrenderingpass'; |
<<<<<<<
this.finishLoading();
=======
this._debugPass = new DebugPass(context);
this._debugPass.initialize();
this._debugPass.framebuffer = this._shadowPass.shadowMapFBO;
this._debugPass.readBuffer = gl.COLOR_ATTACHMENT0;
this._debugPass.target = this._defaultFBO;
... |
<<<<<<<
EnvironmentRenderingPass,
EnvironmentTextureType,
=======
EventProvider,
>>>>>>>
EnvironmentRenderingPass,
EnvironmentTextureType,
EventProvider, |
<<<<<<<
EnvironmentRenderingPass,
EnvironmentTextureType,
=======
EventProvider,
>>>>>>>
EnvironmentRenderingPass,
EnvironmentTextureType,
EventProvider, |
<<<<<<<
import { IAction } from 'shared/types/app';
import { IFields } from 'shared/types/models';
=======
import { IFieldsResponse } from 'shared/api/Api';
>>>>>>>
import { IFields } from 'shared/types/models';
<<<<<<<
function loadFieldsSuccessed(data: IFields): IAction {
=======
export function loadFieldsCompl... |
<<<<<<<
this._equiRectangularMap.fetch('data/equirectangular-map.jpg').then(() => {
this.setupTexture2D(this._equiRectangularMap);
});
=======
promises.push(
this._equiRectangularMap.fetch('data/equirectangular-map.jpg').then(() => {
this.setupTexture2D(... |
<<<<<<<
import { ICategory } from 'shared/types/models';
import { ICommunicationState } from 'shared/helpers/redux';
=======
import { ICategoriesResponse } from 'shared/api/Api';
import { IAction, IPlainAction } from 'shared/types/app';
export interface ICategory {
uid: number;
name: string;
id: number;
}
exp... |
<<<<<<<
import { queryRunningStatus } from './query-loading-action-creators';
export function queryResponseError(response: object): IAction {
return {
type: QUERY_GRAPH_ERROR,
response,
};
}
=======
import { queryResponseError } from './error-action-creator';
>>>>>>>
import { queryResponseError } from '... |
<<<<<<<
export { default as Tooltip } from './Tooltip/Tooltip';
export { default as Select, ISelectOption } from './Select/Select';
export { default as Preloader } from './Preloader/Preloader';
export { default as FormLabel } from './FormLabel/FormLabel';
=======
export { default as Tooltip } from './Tooltip/Tooltip'... |
<<<<<<<
import {Template} from './Template';
import {TemplateHelperFunction} from './TemplateHelpers';
import {Assert} from '../../misc/Assert';
import {ComponentOptions, IComponentOptionsFieldsOption} from '../Base/ComponentOptions';
import {Utils} from '../../utils/Utils';
import {$$} from '../../utils/Dom';
import _... |
<<<<<<<
import {Assert} from '../../misc/Assert'
import {l} from '../../strings/Strings'
import {$$} from '../../utils/Dom'
import {KeyboardUtils, KEYBOARD} from '../../utils/KeyboardUtils';
=======
import {Assert} from '../../misc/Assert';
import {l} from '../../strings/Strings';
import {$$} from '../../utils/Dom';
... |
<<<<<<<
return new this.facetValueElementKlass(this.facet, facetValue, this.facet.keepDisplayedValuesNextTime).build().renderer.listItem;
})
=======
return new this.facetValueElementKlass(this.facet, facetValue, this.facet.keepDisplayedValuesNextTime).build().renderer.listElement;
});
>>>>>>>
... |
<<<<<<<
import * as _ from 'underscore';
=======
import _ = require('underscore');
import {ResultList} from '../ResultList/ResultList';
import {StreamHighlightUtils} from '../../utils/StreamHighlightUtils';
>>>>>>>
import * as _ from 'underscore';
import {ResultList} from '../ResultList/ResultList';
import {StreamHi... |
<<<<<<<
import {KeyboardUtils, KEYBOARD} from '../../utils/KeyboardUtils';
=======
import {IStringMap} from '../../rest/GenericParam';
import {FacetValuesOrder} from './FacetValuesOrder';
import {ValueElement} from './ValueElement';
>>>>>>>
import {KeyboardUtils, KEYBOARD} from '../../utils/KeyboardUtils';
import {I... |
<<<<<<<
private popupBackgroundClickListener: EventListener;
private facets: Array<Facet> = [];
=======
private documentClickListener: EventListener;
private facets: Facet[] = [];
private facetSliders: FacetSlider[] = [];
>>>>>>>
private popupBackgroundClickListener: EventListener;
private facets: Face... |
<<<<<<<
/// <reference path="ui/SearchAlertsTest.ts" />
/// <reference path="ui/FollowItemTest.ts" />
/// <reference path="ui/SearchAlertsMessageTest.ts" />
=======
/// <reference path="ui/FieldSuggestionsTest.ts" />
/// <reference path="ui/AuthenticationProviderTest.ts" />
>>>>>>>
/// <reference path="ui/FieldSugge... |
<<<<<<<
import { GoogleMaps } from '@ionic-native/google-maps';
=======
import { AppVersion } from '@ionic-native/app-version';
>>>>>>>
import { GoogleMaps } from '@ionic-native/google-maps';
import { AppVersion } from '@ionic-native/app-version';
<<<<<<<
Firebase,
GoogleMaps
=======
Firebase,
App... |
<<<<<<<
import {Assert} from '../misc/Assert';
import * as _ from 'underscore';
=======
import _ = require('underscore');
>>>>>>>
import * as _ from 'underscore'; |
<<<<<<<
export {QueryboxQueryParameters} from './ui/Querybox/QueryboxQueryParameters';
export {CoveoJQuery} from './ui/Base/CoveoJQuery';
=======
export {QueryboxQueryParameters} from './ui/Querybox/QueryboxQueryParameters';
export {ImageResultList} from './ui/ImageResultList/ImageResultList';
export {FollowItem} fro... |
<<<<<<<
import * as _ from 'underscore';
=======
import {l} from '../../strings/Strings';
import _ = require('underscore');
>>>>>>>
import * as _ from 'underscore';
import {l} from '../../strings/Strings'; |
<<<<<<<
export {CurrentTab} from './ui/CurrentTab/CurrentTab';
export {CoveoJQuery} from './ui/Base/CoveoJQuery';
=======
export {CurrentTab} from './ui/CurrentTab/CurrentTab';
export {QueryboxQueryParameters} from './ui/Querybox/QueryboxQueryParameters';
>>>>>>>
export {CurrentTab} from './ui/CurrentTab/CurrentTab'... |
<<<<<<<
if (!this.options.openQuickview) {
$$(element).on("click", () => {
this.logOpenDocument();
});
=======
module Coveo {
export class ResultLink extends Component {
static ID = 'ResultLink';
static options = <ResultLinkOptions>{
field: ComponentOptions.buildFieldOption... |
<<<<<<<
private _party_member_on_map:boolean;
=======
private _harvest_indicator: boolean;
>>>>>>>
private _party_member_on_map:boolean;
private _harvest_indicator: boolean;
<<<<<<<
get party_member_on_map():boolean {
return this._party_mem... |
<<<<<<<
=======
import { Jobsxp } from "app/core/mods/jobsxp/jobsxp";
import { FightChronometer } from "app/core/mods/fightchronometer/fightchronometer";
>>>>>>>
import { Jobsxp } from "app/core/mods/jobsxp/jobsxp";
import { FightChronometer } from "app/core/mods/fightchronometer/fightchronometer";
<<<<<<<
=======... |
<<<<<<<
{ name: 'Espagnol', value: "es" },
{ name: 'Italiano', value: "it" }
=======
{ name: 'Español', value: "es" }
>>>>>>>
{ name: 'Español', value: "es" },
{ name: 'Italiano', value: "it" } |
<<<<<<<
import { Component, OnInit } from '@angular/core';
import { FORM_DIRECTIVES } from '@angular/common';
import { single, multi, countries } from './data';
import chartGroups from './chartTypes';
=======
import { Component } from '@angular/core';
import { single, multi } from './data';
>>>>>>>
import { Componen... |
<<<<<<<
import { ThemeProvider, ThemeChangedEventArgs } from '@microsoft/sp-component-base';
import IExtensibilityService from '../../services/ExtensibilityService/IExtensibilityService';
import { ExtensibilityService } from '../../services/ExtensibilityService/ExtensibilityService';
import { ISuggestionProviderDefinit... |
<<<<<<<
import { IQueryModifierDefinition } from '../../services/ExtensibilityService/IQueryModifierDefinition';
import { IQueryModifierInstance } from '../../services/ExtensibilityService/IQueryModifierInstance';
import { ObjectCreator } from '../../services/ExtensibilityService/ObjectCreator';
import { BaseQueryModif... |
<<<<<<<
/**
* utf16-offset where the mapping table starts. Before that index: utf16-index === utf8-index
*/
private _mappingTableStartOffset: number
/**
* utf-16 to utf-8 mapping table for all uft-8 indexes starting at `_mappingTableStartOffset`. utf8-index are always starting at 0.
* `... |
<<<<<<<
export const REQUEST_DELETE_PROJECT = 'REQUEST_DELETE_PROJECT';
export const RECEIVE_DELETE_PROJECT = 'RECEIVE_DELETE_PROJECT';
export function requestDeleteProject(projectId: number) {
return {
type: REQUEST_DELETE_PROJECT,
projectId
};
}
export function receiveDeleteProject(projectId: number, suc... |
<<<<<<<
const toolbox = await r.run('3pack three')
=======
const context = await r.run('three')
>>>>>>>
const toolbox = await r.run('three')
<<<<<<<
const toolbox = await r.run('3pack o')
=======
const context = await r.run('o')
>>>>>>>
const toolbox = await r.run('o')
<<<<<<<
const toolbox = awai... |
<<<<<<<
id: string;
title: string;
description: string;
updated: any; // firebase.firestore.Timestamp | firebase.firestore.FieldValue
created: any; // firebase.firestore.Timestamp | firebase.firestore.FieldValue
}
export interface ThemeTemplateQueryOptions {
limit?: number;
orderBy?: {
field: string,... |
<<<<<<<
import { register } from '../packages/hadron-events';
import ICallbackEvent from '../packages/hadron-events/src/ICallbackEvent';
=======
import { register as serializerRegister, schemaProvider, ISerializerConfig } from '../packages/hadron-serialization';
>>>>>>>
import { register } from '../packages/hadron-... |
<<<<<<<
return createConnection(connection)
.then(connection => registerConnection(container, connection))
.then((connection: Connection) => {
const entities = config.connection.entities || config.connection.entitySchemas || [];
registerRepositories(container, connection, entities);
return c... |
<<<<<<<
import eventsManagerProvider from './src/eventsMaganerProvider';
=======
import eventsManagerProvider from './src/eventsManagerProvider';
export * from './src/constants';
>>>>>>>
import eventsManagerProvider from './src/eventsManagerProvider';
<<<<<<<
if (container.take('event-emitter') === null) {
co... |
<<<<<<<
import { ConnectionOptions, createConnection } from 'typeorm';
import { Container as container } from '../../packages/hadron-core';
=======
import container from '../containers/container';
>>>>>>>
import { Container as container } from '../../packages/hadron-core'; |
<<<<<<<
import GRU from './recurrent/gru';
import GRUTimeStep from './recurrent/gru-time-step';
import { LSTM } from './recurrent/lstm';
import { LSTMTimeStep } from './recurrent/lstm-time-step';
=======
import { GRU } from './recurrent/gru';
import { GRUTimeStep } from './recurrent/gru-time-step';
import LSTM from '... |
<<<<<<<
fromBytes(tx: IBytesTransaction): IBaseTransaction<any>;
=======
/**
* Attach Asset object to each transaction passed
* @param {Array<IConfirmedTransaction<any>>} txs
* @return {Promise<void>}
*/
attachAssets(txs: Array<IConfirmedTransaction<any>>): Promise<void>;
>>>>>>>
fromBytes(tx: IB... |
<<<<<<<
/**
* Calculates block id.
* @param {BlockType} block
* @param {Buffer} fromBytes
* @returns {string}
*/
public static getId(block: BlockType, fromBytes?: Buffer): string {
const bytes = fromBytes ? fromBytes : this.getBytes(block);
const hash = crypto.createHash('sha256').update(byte... |
<<<<<<<
=======
LoaderModuleRewire.__set__('promiseRetry', promiseRetryStub);
>>>>>>>
<<<<<<<
(instance as any).sequence.addAndPromise = sandbox.stub().callsFake((w) => Promise.resolve(w()));
=======
(instance as any).defaultSequence.addAndPromise = sandbo... |
<<<<<<<
TransactionPoolStub,
TransactionsModuleStub
=======
TransactionsModuleStub,
>>>>>>>
TransactionPoolStub,
TransactionsModuleStub, |
<<<<<<<
import {
doubleFollow,
flushAndRunMultipleServers,
flushTests,
killallServers,
makeActivityPubGetRequest,
runServer,
ServerInfo,
setAccessTokensToServers, uploadVideo
} from '../../utils'
=======
import {
flushTests,
killallServers,
makeActivityPubGetRequest,
runServer,
ServerInfo,
... |
<<<<<<<
sendNotification (userId: number, notification: UserNotificationModel) {
const sockets = this.userNotificationSockets[userId]
=======
sendNotification (userId: number, notification: UserNotificationModelForApi) {
const socket = this.userNotificationSockets[userId]
>>>>>>>
sendNotification (user... |
<<<<<<<
body('originallyPublishedAt')
.optional()
.customSanitizer(toValueOrNull)
.custom(isVideoOriginallyPublishedAtValid).withMessage('Should have a valid original publication date'),
=======
body('downloadEnabled')
.optional()
.toBoolean()
.custom(isBooleanValid).withMe... |
<<<<<<<
const label = d.id === 0
? this.player().localize('Audio-only')
=======
const label = d.label === '0p'
? this.player.localize('Audio-only')
>>>>>>>
const label = d.label === '0p'
? this.player().localize('Audio-only') |
<<<<<<<
=======
// Thanks: https://github.com/przemyslawpluta/node-youtube-dl/blob/master/lib/downloader.js
// We rewrote it to avoid sync calls
async function updateYoutubeDLBinary () {
logger.info('Updating youtubeDL binary.')
const binDirectory = join(root(), 'node_modules', 'youtube-dl', 'bin')
const bin =... |
<<<<<<<
import { RichTextEditor } from '../cell_editors/richTextEditor.js'
=======
import { urlContains } from '../utils'
>>>>>>>
import { RichTextEditor } from '../cell_editors/richTextEditor.js'
import { urlContains } from '../utils' |
<<<<<<<
constructor(private urlMapper: UrlMapper) { }
public addIpToBanList = (rule: IPRuleContract, callback: (result: boolean) => void) => {
return $.post(this.urlMapper.mapRelative("/api/admin/permBannedIPs"), rule, callback);
=======
public addIpToBanList = (rule: vdb.viewModels.IPRuleCon... |
<<<<<<<
import ArtistContract from '../../DataContracts/Artist/ArtistContract';
import FakeArtistRepository from '../TestSupport/FakeArtistRepository';
import FakeSongRepository from '../TestSupport/FakeSongRepository';
import ResourceRepository from '../../Repositories/ResourceRepository';
import SongCreateViewModel f... |
<<<<<<<
export interface IWindowSettings {
openFilesInNewWindow: boolean;
reopenFolders: 'all' | 'one' | 'none';
restoreFullscreen: boolean;
zoomLevel: number;
titleBarStyle: 'native' | 'custom';
}
export class VSCodeWindow implements IVSCodeWindow {
=======
export class VSCodeWindow {
>>>>>>>
export class VSC... |
<<<<<<<
import {ListenerUnbind} from 'vs/base/common/eventEmitter';
import {Keybinding} from 'vs/base/common/keyCodes';
=======
>>>>>>>
import {Keybinding} from 'vs/base/common/keyCodes'; |
<<<<<<<
import ActionsRenderer = require('vs/base/parts/tree/browser/actionsRenderer');
import Actions = require('vs/base/common/actions');
import {compareAnything} from 'vs/base/common/comparers';
import ActionBar = require('vs/base/browser/ui/actionbar/actionbar');
import TreeDefaults = require('vs/base/parts/tree/br... |
<<<<<<<
if (resource.scheme === 'file') {
content = `${resource.fsPath}\n${content}`;
}
return this.fileService.updateContent(backupResource, content, BACKUP_FILE_UPDATE_OPTIONS).then(() => void 0);
=======
if (model.has(backupResource, versionId)) {
return void 0; // return early if backup version i... |
<<<<<<<
import { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
=======
export interface IEnvironment {
appSettingsHome: string;
disableExtensions: boolean;
userExtensionsHome: string;
extensionDevelopmentPath: string;
extensionTestsPath: string;
}
export interface... |
<<<<<<<
this._styleSheet = dom.createStyleSheet();
this._decorationOptionProviders = Object.create(null);
=======
this._styleSheet = styleSheet;
this._decorationRenderOptions = Object.create(null);
>>>>>>>
this._styleSheet = styleSheet;
this._decorationOptionProviders = Object.create(null);
<<<<<<<
c... |
<<<<<<<
private getConflictsOrEmpty(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
=======
private getConflictsOrEmpty(document: vscode.TextDocument, origins: string[]): interfaces.IDocumentMergeConflict[] {
let stepStart = process.hrtime();
>>>>>>>
private getConflictsOrEmpty(document: v... |
<<<<<<<
// test('TerminalService - createTerminalEnv', function () {
// const shell1 = {
// executable: '/bin/foosh',
// args: ['-bar', 'baz']
// };
// const parentEnv1: IStringDictionary<string> = <any>{
// ok: true
// };
// const env1 = TerminalService.createTerminalEnv(parentEnv1, shell1, null, '... |
<<<<<<<
get backupHome(): string { return path.join(this.userDataPath, 'Backups'); }
@memoize
get backupWorkspacesPath(): string { return path.join(this.backupHome, 'workspaces.json'); }
@memoize
get extensionsPath(): string { return path.normalize(this._args.extensionHomePath || path.join(this.userHome, 'extens... |
<<<<<<<
// make sure all dirty files are saved and make sure configuration is up to date
return this.textFileService.saveAll().then(() => this.configurationService.reloadConfiguration().then(() => this.extensionService.onReady().then(() => {
const compound = typeof configurationOrName === 'string' ? this.configu... |
<<<<<<<
// Load configuration
const trinityConfig: TrinityConfig = new TrinityConfig();
=======
// Load configuration and event watcher
const trinityConfig = new TrinityConfig();
// Trigger event watcher
>>>>>>>
// Load configuration and event watcher
const trinityConfig: TrinityConfig = new TrinityCo... |
<<<<<<<
if (resource.scheme === 'file') {
content = `${resource.fsPath}\n${content}`;
}
return this.fileService.updateContent(backupResource, content).then(() => void 0);
=======
return this.fileService.updateContent(backupResource, content, BACKUP_FILE_UPDATE_OPTIONS).then(() => void 0);
>>>>>>>
if (r... |
<<<<<<<
import {EditorStacksModel, EditorGroup, IEditorIdentifier} from 'vs/workbench/common/editor/editorStacksModel';
=======
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
>>>>>>>
import {EditorStacksModel, EditorGroup, IEditorIdentifier} from 'vs/workbench/common/editor/editorStacksModel';
import... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.