conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
commands[uproxy_core_api.Command.CHECK_REPROXY] = core.checkReproxy;
=======
commands[uproxy_core_api.Command.UPDATE_GLOBAL_SETTING] = core.updateGlobalSetting;
>>>>>>>
commands[uproxy_core_api.Command.UPDATE_GLOBAL_SETTING] = core.updateGlobalSetting;
commands[uproxy_core_api.Command.CHECK_REPROXY] = core.c... |
<<<<<<<
// Payload for SIGNAL_FROM_CLIENT_PEER and SIGNAL_FROM_SERVER_PEER messages.
// Other payload types exist, e.g. bridging peerconnection signals.
export interface SignallingMetadata {
// Random ID associated with this proxying attempt.
// Used for logging purposes and implicitly delimits proxying attempts.
... |
<<<<<<<
private portControl_?:freedom.PortControl.PortControl,
private preferredObfuscatorConfig_?:ObfuscatorConfig) {
this.peerName = peerName || 'churn-connection-' +
(++Connection.internalConnectionId_);
=======
private portControl_?:freedom.PortContr... |
<<<<<<<
public shouldContainStringAndDoesNotThrows(actualValue: string, expectedContent: string) {
let expect = Expect(actualValue);
=======
public shouldContainAndDoesNotThrows(actualValue: any, expectedContent: any) {
const expect = Expect(actualValue);
>>>>>>>
public shouldContainStringAndDoe... |
<<<<<<<
spyOn(ui, 'showNotification');
=======
spyOn(network, 'notifyUI');
spyOn(network, 'sendInstanceHandshake');
expect(network.isLoginPending()).toEqual(false);
>>>>>>>
spyOn(ui, 'showNotification');
spyOn(network, 'sendInstanceHandshake');
<<<<<<<
=======
expect(ne... |
<<<<<<<
=======
toggleAdvancedSettings: function() {
this.displayAdvancedSettings = !this.displayAdvancedSettings;
if (!this.displayAdvancedSettings) {
// Hiding the advanced settings will also hide the confirmation
// messages.
this.$.confirmNewServer.hidden = true;
this.$.confirmRe... |
<<<<<<<
=======
* Check local storage for saved state about this FreedomNetwork. If there
* exists actual state, load everything into memory. Otherwise, initialize
* to sane defaults.
*/
private syncFromStorage_ = () : Promise<void> => {
var preparedMyself = this.prepareLocalInstance_();... |
<<<<<<<
conduits: Array<Conduit>, //TODO: Verify this is the structure in the combatlog
error?: any, //TODO: Verify, is this a bool? string?
=======
conduits: Conduit[], //TODO: Verify this is the structure in the combatlog
>>>>>>>
conduits: Conduit[], //TODO: Verify this is the structure in the combatlog
... |
<<<<<<<
public startCopyPasteShare = () : void => {
this.copyPasteSharingMessages_ = [];
=======
public startCopyPasteShare = () => {
this.resetBatcher_();
>>>>>>>
public startCopyPasteShare = () => {
this.resetBatcher_();
<<<<<<<
public sendCopyPasteSignal = (signal :social.PeerMessage) :void =... |
<<<<<<<
INVITE_GITHUB_USER = 1028
=======
SEND_INVITATION = 1028,
CLOUD_UPDATE = 1029,
UPDATE_ORG_POLICY = 1030,
REMOVE_CONTACT = 1031
>>>>>>>
INVITE_GITHUB_USER = 1028,
CLOUD_UPDATE = 1029,
UPDATE_ORG_POLICY = 1030,
REMOVE_CONTACT = 1031
<<<<<<<
getInviteUrl(data :CreateInviteArgs): Promise<str... |
<<<<<<<
var uProxyAppChannel;
var Chrome_oauth;
var connector :ChromeUIConnector;
=======
var uProxyAppChannel : OnAndEmit<any,any>;
>>>>>>>
var connector :ChromeUIConnector;
var uProxyAppChannel : OnAndEmit<any,any>;
<<<<<<<
}).then(function(UProxy:any) {
uProxyAppChannel = new UProxy();
=======
}).then(functi... |
<<<<<<<
model: model,
onlineTrustedUproxyContacts: model.contacts.onlineTrustedUproxy,
offlineTrustedUproxyContacts: model.contacts.offlineTrustedUproxy,
onlineUntrustedUproxyContacts: model.contacts.onlineUntrustedUproxy,
offlineUntrustedUproxyContacts: model.contacts.offlineUntrustedUproxy,
onlineNonUprox... |
<<<<<<<
enableStats: function() {
model.globalSettings.statsReportingEnabled = true;
=======
loginToQuiver: function() {
model.globalSettings.quiverUserName = this.userName;
core.updateGlobalSettings(model.globalSettings);
this.login('Quiver', this.userName);
},
loginTapped: function(event: Ev... |
<<<<<<<
/// <reference path='../../third_party/typings/es6-promise/es6-promise.d.ts' />
=======
/// <reference path='../handler/queue.d.ts' />
/// <reference path="../third_party/typings/es6-promise/es6-promise.d.ts" />
/// <reference path='../freedom/typings/rtcdatachannel.d.ts' />
>>>>>>>
/// <reference path='../.... |
<<<<<<<
export var onceReady :Promise<freedom_types.OnAndEmit<any,any>> =
loadModule().then((copypaste:freedom_types.OnAndEmit<any,any>) => {
copypaste.on('signalForPeer', (message:string) => {
=======
export var onceReady :Promise<freedom.OnAndEmit<any,any>> =
loadModule().then((copypaste:freedom... |
<<<<<<<
new Notification('uProxy', { body: notificationText,
icon: 'icons/' + UI.DEFAULT_ICON});
=======
var notification =
new Notification('uProxy', { body: notificationText,
icon: 'icons/uproxy-128.png'});
setTimeout(function... |
<<<<<<<
import { AsyncTest, Expect, METADATA_KEYS, SpyOn, Timeout } from "../../../../core/alsatian-core";
import { MatchError } from "../../../../core/errors";
=======
import { AsyncTest, Expect } from "../../../../core/alsatian-core";
>>>>>>>
import { AsyncTest, Expect, METADATA_KEYS, SpyOn, Timeout } from "../../... |
<<<<<<<
network['login'] = (reconnect :boolean) => { return Promise.resolve<void>() };
=======
network['login'] = (remember:boolean) => { return Promise.resolve<void>() };
network['myInstance'] =
new local_instance.LocalInstance(network, 'localUserId');
>>>>>>>
network['login'] = (reconnect :bool... |
<<<<<<<
=======
import { ITestCompleteEvent, IOnTestCompleteCBFunction } from "../events";
import "reflect-metadata";
>>>>>>>
<<<<<<<
await this._runTests(testSetRunInfo, testSetResults);
=======
await this._runTests(testSetRunInfo, testSetResults);
>>>>>>>
await this._runTests(testSetRunIn... |
<<<<<<<
this.imageData = profile.imageData || Constants.DEFAULT_USER_IMG;
=======
this.imageData = profile.imageData || UI.DEFAULT_USER_IMG;
this.offeringInstances = payload.offeringInstances;
this.allInstanceIds = payload.allInstanceIds;
this.updateInstanceDescriptions();
this.con... |
<<<<<<<
// Accepted in serialised form by configure().
export interface EncryptionConfig {
key:string
}
// Creates a sample (non-random) config, suitable for testing.
export var sampleConfig = () : EncryptionConfig => {
var bytes = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
var hex = array... |
<<<<<<<
=======
import { TestLoader } from "../../../../core/test-loader";
import { FileRequirer } from "../../../../core/file-requirer";
import { Expect, Test, TestCase, SpyOn, METADATA_KEYS } from "../../../../core/alsatian-core";
>>>>>>>
import { TestLoader } from "../../../../core/test-loader";
import { FileRequ... |
<<<<<<<
export var MESSAGE_VERSION = 4;
=======
// 4: holographic ICE
export var MESSAGE_VERSION = 4;
>>>>>>>
// 4: holographic ICE
export var MESSAGE_VERSION = 4;
<<<<<<<
export var metrics = new metrics_module.Metrics(storage);
export var pgp :PgpProvider = freedom['pgp']();
pgp.setup('', '<uproxy>');
export va... |
<<<<<<<
this.instances_[instanceId] =
new Core.RemoteInstance(this, instance.instanceId, instance);
this.saveToStorage();
=======
existingInstance = new Core.RemoteInstance(this, instance);
this.instances_[instanceId] = existingInstance;
}
if (data.consent) {
... |
<<<<<<<
public shouldMatchAndDoesNotThrows(actualValue: string, expectedRegex: RegExp) {
let expect = Expect(actualValue);
=======
public shouldMatchAndDoesNotThrows(actualValue: any, expectedRegex: RegExp) {
const expect = Expect(actualValue);
>>>>>>>
public shouldMatchAndDoesNotThrow(actualVal... |
<<<<<<<
import { Lifecycle, Lifecycles } from './types'
export function warn(trigger: string): void
export function warn(trigger: boolean, msg?: string): void
export function warn(trigger: any, msg?: any) {
=======
export function warn(trigger: boolean | string, msg?: string) {
>>>>>>>
import { Lifecycle, Lifecycl... |
<<<<<<<
import { Layer, Marker, PathOptions, point, SVG } from 'leaflet';
=======
import { Feature as GeoJSONFeature, FeatureCollection as GeoJSONFeatureCollection } from 'geojson';
import {Layer, Marker, PathOptions, point, SVG} from 'leaflet';
>>>>>>>
import { Feature as GeoJSONFeature, FeatureCollection as GeoJSO... |
<<<<<<<
import { IGenericGeoJSONFeature } from './d.ts/generic-geojson';
import { expect } from 'chai';
=======
import { GenericGeoJSONFeature } from '@yaga/generic-geojson';
>>>>>>>
import { expect } from 'chai';
import { GenericGeoJSONFeature } from '@yaga/generic-geojson';
<<<<<<<
const TEST_VALUE: IGene... |
<<<<<<<
const TEST_VALUE: IGenericGeoJSONFeature<GeoJSON.Polygon, any> = {
=======
var map: MapComponent,
layer: RectangleDirective<any>;
const TEST_VALUE: GenericGeoJSONFeature<GeoJSON.Polygon, any> = {
>>>>>>>
const TEST_VALUE: GenericGeoJSONFeature<G... |
<<<<<<<
import { IGenericGeoJSONFeature } from './d.ts/generic-geojson';
import { expect } from 'chai';
=======
import { GenericGeoJSONFeature } from '@yaga/generic-geojson';
>>>>>>>
import { expect } from 'chai';
import { GenericGeoJSONFeature } from '@yaga/generic-geojson';
<<<<<<<
const TEST_VALUE: I... |
<<<<<<<
export * from './wms-layer.directive';
=======
export * from './icon.directive';
export * from './div-icon.directive';
export * from './tooltip.directive';
>>>>>>>
export * from './wms-layer.directive';
export * from './icon.directive';
export * from './div-icon.directive';
export * from './tooltip.directive... |
<<<<<<<
export * from './icon.directive';
export * from './div-icon.directive';
export * from './tooltip.directive';
=======
export * from './icon.directive';
export * from './div-icon.directive';
>>>>>>>
export * from './icon.directive';
export * from './div-icon.directive';
export * from './tooltip.directive';
<<... |
<<<<<<<
@Input() set tileSize(val: Point) {
(<TileLayerOptions>(<any>this).options).tileSize = val;
=======
set tileSize(val: Point) {
this.options.tileSize = val;
>>>>>>>
@Input() set tileSize(val: Point) {
(<TileLayerOptions>(<any>this).options).tileSize = val;
this.opti... |
<<<<<<<
import { AttributionControlDirective } from './attribution-control.directive';
=======
import { ScaleControlDirective } from './scale-control.directive';
>>>>>>>
import { AttributionControlDirective } from './attribution-control.directive';
import { ScaleControlDirective } from './scale-control.directive... |
<<<<<<<
private _tap: boolean = false;
public get tap(): boolean {
return this._tap;
}
=======
private _versionRequested: boolean = false;
public get versionRequested(): boolean {
return this._versionRequested;
}
>>>>>>>
private _tap: boolean = false;
public get tap(): boolean {... |
<<<<<<<
if (
!_.isEmpty(options.consumerVersionTag) ||
!_.isEmpty(options.providerVersionTag)
) {
logger.warn(
"'consumerVersionTag' and 'providerVersionTag' have been deprecated, please use 'consumerVersionTags' or 'providerVersionTags' instead",
);
}
=======
if (options.includeWipPactsSince... |
<<<<<<<
BatchedNetworkPeer.prototype.sendPacket = procHacker.js('BatchedNetworkPeer::sendPacket', RawTypeId.Void, {this:BatchedNetworkPeer}, CxxStringStructure, RawTypeId.Int32, RawTypeId.Int32, RawTypeId.Int32, RawTypeId.Int32);
=======
BatchedNetworkPeer.prototype.sendPacket = makefunc.js(proc['BatchedNetworkPeer::... |
<<<<<<<
export import VoidPointer = core.VoidPointer;
export import StaticPointer = core.StaticPointer;
export import NativePointer = core.NativePointer;
export import ipfilter = core.ipfilter;
export import jshook = core.jshook;
export import createPacket = nethook.createPacket;
export import sendPacket = nethook.send... |
<<<<<<<
type: uint8_t,
name: CxxString,
message: CxxString,
needsTranslation: [uint8_t, 0x90],
=======
type: [uint8_t, 0x28],
needsTranslation: [bool_t, 0x29],
name: [CxxString, 0x30],
message: [CxxString, 0x50],
>>>>>>>
type: uint8_t,
name: CxxString,
message: CxxString,
... |
<<<<<<<
FunctionSpy,
RestorableFunctionSpy,
=======
>>>>>>>
FunctionSpy,
RestorableFunctionSpy, |
<<<<<<<
export * from './models/FileInfoCard';
export * from './models/AdaptiveCard';
export * from './models/TaskModuleAction';
export * from './models/TaskModuleResponse';
=======
export * from './models/FileInfoCard';
export * from './models/ListCard';
>>>>>>>
export * from './models/FileInfoCard';
export * from ... |
<<<<<<<
* Return a list of members in a conversation or channel
=======
* @deprecated Since version 0.1.2 Will be deleted in version 0.1.5. Use fetchMembers(serverUrl, conversationId, callback).
* Return a list of members in a team or channel
>>>>>>>
* @deprecated Since version 0.1.2 Will be deleted in v... |
<<<<<<<
import { InMemorySigner } from "@taquito/signer";
=======
import { storageContract } from "./data/storage-contract";
>>>>>>>
import { InMemorySigner } from "@taquito/signer";
import { storageContract } from "./data/storage-contract"; |
<<<<<<<
knownBigMapContract: string,
protocol: Protocols
=======
protocol: Protocols,
signerConfig: EphemeralConfig | FaucetConfig
}
/**
* SignerType specifies the different signer options used in the integration test suite. EPHEMERAL_KEY relies on a the [tezos-key-get-api](https://github.com/ecadlabs/tezos-... |
<<<<<<<
BakingRightsQueryArguments,
BakingRightsResponse,
=======
BallotListResponse,
BallotsResponse,
PeriodKindResponse,
CurrentProposalResponse,
CurrentQuorumResponse,
VotesListingsResponse,
ProposalsResponse,
>>>>>>>
BakingRightsQueryArguments,
BakingRightsResponse,
BallotListResponse,
... |
<<<<<<<
PackDataParams,
PackDataResponse,
=======
BigMapResponse,
>>>>>>>
PackDataParams,
PackDataResponse,
BigMapResponse, |
<<<<<<<
import { Promise } from "../../../../promise/promise";
import { TestBuilder } from "../../../builders/test-builder";
import { TestFixtureBuilder } from "../../../builders/test-fixture-builder";
import { TestSetBuilder } from "../../../builders/test-set-builder";
=======
import "reflect-metadata";
>>>>>>>
imp... |
<<<<<<<
export async function changeColorSetting(
backgroundHex: string,
foregroundHex: string
) {
=======
export async function changeColorSetting(colorCustomizations: {}) {
return await workspace
.getConfiguration()
.update(
'workbench.colorCustomizations',
colorCustomizations,
vsco... |
<<<<<<<
=======
export enum VimSpecialCommands {
Nothing,
ShowCommandLine,
Dot
}
export class ViewChange {
public command: string;
public args: any;
}
>>>>>>>
export class ViewChange {
public command: string;
public args: any;
}
<<<<<<<
public isMultiCursor = false;
=======
public static las... |
<<<<<<<
newTest({
title: "Changes on a firstline selection will not delete first character",
start: ["test|jojo", "haha"],
keysPressed: "vj0c",
end: ["test|haha"],
endMode: ModeName.Insert
});
=======
suite("D command will remove all selected lines", () => {
newTest({
title: "D d... |
<<<<<<<
if (this._vimState.lastCursorTypeSet !== options.cursorStyle) {
if (options.cursorStyle === vscode.TextEditorCursorStyle.Block) {
this._vimState.editor.options.cursorStyle = vscode.TextEditorCursorStyle.Line;
this._vimState.editor.options.cursorStyle = vscode.TextEditorCursorStyle.Bloc... |
<<<<<<<
createFiles({
scopeToKeys,
=======
createTranslationFiles({
keys,
scopes: config.scopes,
>>>>>>>
createTranslationFiles({
scopeToKeys,
scopes: config.scopes, |
<<<<<<<
import { generateVueComponentJS, generateNodeSyntax, extractStateObject } from './utils'
=======
import { generateVueComponentJS, generateVueNodesTree, extractStateObject } from './utils'
import { ComponentPluginFactory, ComponentPlugin } from '../../typings/generators'
>>>>>>>
import { generateVueComponentJ... |
<<<<<<<
import * as types from '@babel/types'
import { createDefaultExport } from '@teleporthq/teleport-shared/lib/builders/ast-builders'
import { makePureComponent, generateNodeSyntax, createStateIdentifiers } from './utils'
import { ComponentPluginFactory, ComponentPlugin } from '@teleporthq/teleport-types'
=======
... |
<<<<<<<
import { extractRoutes } from '../../shared/utils/uidl-utils'
=======
import { Validator } from '../../core'
>>>>>>>
import { extractRoutes } from '../../shared/utils/uidl-utils'
import { Validator } from '../../core'
<<<<<<<
const routes = extractRoutes(root)
// Step 1: The first level conditional... |
<<<<<<<
import { makePureComponent, generateNodeSyntax, createStateIdentifiers } from './utils'
import * as types from '@babel/types'
=======
import { makePureComponent, generateTreeStructure, createStateIdentifiers } from './utils'
import { ComponentPluginFactory, ComponentPlugin } from '../../typings/generators'
>... |
<<<<<<<
import { extractRoutes } from '../../shared/utils/uidl-utils'
=======
>>>>>>>
import { extractRoutes } from '../../shared/utils/uidl-utils'
<<<<<<<
const routeNodes = extractRoutes(root)
// Step 1: The first level conditionals become the pages
const pagePromises = routeNodes.map((routeNode) => ... |
<<<<<<<
import { extractRoutes } from '../../shared/utils/uidl-utils'
=======
import { Validator } from '../../core'
>>>>>>>
import { extractRoutes } from '../../shared/utils/uidl-utils'
import { Validator } from '../../core'
<<<<<<<
// Step 1: The first level stateBranches (the pages) transformation in react c... |
<<<<<<<
import * as types from '@babel/types'
=======
// @ts-ignore
>>>>>>>
import * as types from '@babel/types'
// @ts-ignore |
<<<<<<<
import { extractPageMetadata, extractRoutes } from '../../shared/utils/uidl-utils'
=======
import { extractPageMetadata } from '../../shared/utils/uidl-utils'
import { ComponentPluginFactory, ComponentPlugin } from '../../typings/generators'
>>>>>>>
import { extractPageMetadata, extractRoutes } from '../../s... |
<<<<<<<
import { colors, ensureDir, ensureFile, fromStreamReader, gzipDecode, path, Untar } from '../deps.ts'
import log from '../log.ts'
=======
import { gzipDecode } from 'https://deno.land/x/wasm_gzip@v1.0.0/mod.ts'
import { ensureDir, ensureFile, fromStreamReader, path, Untar } from '../std.ts'
>>>>>>>
import { ... |
<<<<<<<
/**
* These actions are dispatched immediatly after adding the module in the store
*/
initialActions?: AnyAction[];
=======
/**
* Middlewares to add to the store
*/
middlewares?: Middleware[];
/**
* These sagas are executed immediately after adding the module to the store... |
<<<<<<<
var sandbox;
beforeEach(() => {
sandbox = sinon.sandbox.create();
});
afterEach(() => {
// Dispose the default app insights client and auto collectors so that they can be reconfigured
// cleanly for each test
AppInsights.dispose();
... |
<<<<<<<
{
basePath: 'mariadb/resource-manager',
namespace: 'Microsoft.DBforMariaDB',
},
=======
{
basePath: 'mysql/resource-manager',
namespace: 'Microsoft.DBforMySQL',
},
>>>>>>>
{
basePath: 'mariadb/resource-manager',
namespace: 'Microsoft.DBfo... |
<<<<<<<
import { SchemaConfiguration, generateSchemas, clearAutogeneratedSchemaRefs, saveAutogeneratedSchemaRefs } from '../generate';
import { whitelist } from '../whitelist';
=======
import { generateSchemas, clearAutogeneratedSchemaRefs, saveAutogeneratedSchemaRefs } from '../generate';
import { getWhitelist } fro... |
<<<<<<<
=======
import { AlsatianCliOptions } from "./alsatian-cli-options";
import { TestRunner, TestSet, TestOutputStream } from "../core/alsatian-core";
>>>>>>>
import { AlsatianCliOptions } from "./alsatian-cli-options";
import { TestRunner, TestSet, TestOutputStream } from "../core/alsatian-core";
<<<<<<<
p... |
<<<<<<<
{
basePath: 'batchai/resource-manager',
namespace: 'Microsoft.BatchAI',
},
{
=======
{
basePath: 'alertsmanagement/resource-manager',
namespace: 'Microsoft.AlertsManagement',
},
{
basePath: 'attestation/resource-manager',
namespace: 'Mi... |
<<<<<<<
basePath: 'managementpartner/resource-manager',
namespace: 'Microsoft.ManagementPartner',
},
{
=======
basePath: 'maps/resource-manager',
namespace: 'Microsoft.Maps',
},
{
>>>>>>>
basePath: 'managementpartner/resource-manager',
namespace: 'Micro... |
<<<<<<<
basePath: 'managementgroups/resource-manager',
namespace: 'Microsoft.Management',
},
{
=======
basePath: 'managementpartner/resource-manager',
namespace: 'Microsoft.ManagementPartner',
},
{
basePath: 'maps/resource-manager',
namespace: 'Microsoft... |
<<<<<<<
{
basePath: 'deviceprovisioningservices/resource-manager',
namespace: 'Microsoft.Devices',
suffix: 'Provisioning',
},
{
=======
{
>>>>>>>
{
<<<<<<<
basePath: 'iothub/resource-manager',
namespace: 'Microsoft.Devices',
},
{
=======
... |
<<<<<<<
{
basePath: 'vmwarecloudsimple/resource-manager',
namespace: 'Microsoft.VMwareCloudSimple',
},
=======
{
"basePath": "windowsiot/resource-manager",
"namespace": "Microsoft.WindowsIoT"
}
>>>>>>>
{
basePath: 'vmwarecloudsimple/resource-manager',
... |
<<<<<<<
// import Link from './Link/Link';
=======
>>>>>>>
// import Link from './Link/Link';
<<<<<<<
},
// {
// name: 'Link',
// component: Link,
// icon: 'link',
// }
];
// icons:
// code-block
// media
=======
}
];
>>>>>>>
}
]; |
<<<<<<<
}
export function modifyPropertyAtPath(obj: any, fn: (value: any) => any, path: (string|number)[]): any {
if (!path.length) {
return fn(obj);
}
const [segment, ...rest] = path;
// keep arrays if possible
if (typeof segment == 'number' && segment >= 0) {
if (obj == undefined... |
<<<<<<<
=======
@Input()
type: CalendarType = 'single';
>>>>>>>
<<<<<<<
@Input()
type: CalendarType = 'single';
@Input()
disableFunction = function(d): boolean {
return false;
};
@Input()
blockFunction = function(d): boolean {
return false;
};
=======
... |
<<<<<<<
import { FormDocsComponent } from './containers/form/form-docs.component';
=======
import { SideNavigationDocsComponent } from './containers/side-navigation/side-navigation-docs.component';
>>>>>>>
import { FormDocsComponent } from './containers/form/form-docs.component';
import { SideNavigationDocsComponent... |
<<<<<<<
declare module 'webfontloader'
=======
declare module 'react-breakpoints'
>>>>>>>
declare module 'webfontloader'
declare module 'react-breakpoints' |
<<<<<<<
// Redundant, because add does this, but called explicitly for thoroughness
await updateCommand(await makeConfig(appDir), 'ios', false);
=======
>>>>>>> |
<<<<<<<
// ctx.fillStyle = "black";
// ctx.fillRect(0, 0, textureSize, textureSize);
=======
ctx.save();
ctx.fillStyle = "black";
ctx.fillRect(0, 0, textureSize, textureSize);
>>>>>>>
ctx.save(); |
<<<<<<<
const regEx = /(.*);\sMax-Age=(.*)/;
const matches = xsrfToken.match(regEx);
if (matches.length !== 3) {
throw Error('xsrfToken does not look like as expected:' + xsrfToken);
=======
const regEx = /(.*);\sMax-Age=(.*)/;
const matches = xsrfToken.match(regEx);
if (matches.length !... |
<<<<<<<
import {Router} from '@angular/router';
import {FinTechAuthorizationService} from '../../api';
import {StorageService} from '../../services/storage.service';
import {TestBed} from '@angular/core/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {ConsentAuthorizationService} ... |
<<<<<<<
r.mathInline,
=======
r.math,
r.spin,
>>>>>>>
r.mathInline,
r.spin,
<<<<<<<
r.mathInline,
=======
r.flip,
r.math,
>>>>>>>
r.flip,
r.mathInline, |
<<<<<<<
import { Attributes } from '../../src/dynamo-easy'
=======
import { Attributes } from '../../src/mapper/type/attribute.type'
import { Organization } from '../models'
>>>>>>>
import { Attributes } from '../../src/dynamo-easy'
import { Organization } from '../models' |
<<<<<<<
const expression = Reflect.get(params, expressionType)
if (isString(expression)) {
switch (expressionType) {
case 'UpdateExpression':
if (expression !== '') {
throw new Error(
'params.UpdateExpression is not empty, please use the UpdateRequest.operations() method to d... |
<<<<<<<
if (typeof modelValue !== 'number') {
throw new Error('this mapper only support values of type number')
=======
if (!isNumber(modelValue)) {
throw new Error(`this mapper only support values of type number, value given: ${JSON.stringify(modelValue)}`)
>>>>>>>
if (typeof modelValue !== 'number') ... |
<<<<<<<
if (isCollection(value)) {
return detectCollectionTypeFromValue(value)
} else if (typeof value === 'string') {
=======
if (isString(value)) {
>>>>>>>
if (typeof value === 'string') {
<<<<<<<
} else if (typeof value === 'number') {
=======
} else if (isNumber(value)) {
// TODO LOW: we s... |
<<<<<<<
}
export async function getUserByEmail(email: string) {
if (!config.FIREBASE_ADMIN_SDK_CONFIG) {
return;
}
return await admin.auth().getUserByEmail(email);
=======
}
export async function getUserEmail(uid: string) {
if (!config.FIREBASE_ADMIN_SDK_CONFIG) {
return undefined;
}
const user ... |
<<<<<<<
=======
* If the "(p)npm-local" symlink hasn't been set up yet, this creates it, installing the
* specified (P)npm version in the user's home directory if needed.
*/
public ensureLocalPackageManager(): Promise<void> {
// Example: "C:\Users\YourName\.rush"
const rushUserFolder: string = this... |
<<<<<<<
private _cleanParameter: CommandLineFlagParameter;
=======
private _noLinkParameter: CommandLineFlagParameter;
>>>>>>>
private _cleanParameter: CommandLineFlagParameter
private _noLinkParameter: CommandLineFlagParameter;
<<<<<<<
this._cleanParameter = this.defineFlagParameter({
parameterLo... |
<<<<<<<
import { FileSystem, Import } from '@rushstack/node-core-library';
=======
import { FileSystem, AlreadyReportedError } from '@rushstack/node-core-library';
>>>>>>>
import { FileSystem, AlreadyReportedError, Import } from '@rushstack/node-core-library';
<<<<<<<
import { AlreadyReportedError } from '../../uti... |
<<<<<<<
import { SassTypingsPlugin } from '../plugins/SassTypingsPlugin/SassTypingsPlugin';
import { HeftConfigFiles } from '../utilities/HeftConfigFiles';
=======
import { ProjectValidatorPlugin } from '../plugins/ProjectValidatorPlugin';
>>>>>>>
import {
CoreConfigFiles,
IHeftConfigurationJson,
IHeftConfigur... |
<<<<<<<
=======
import { RigConfig } from '@rushstack/rig-package';
import { ITypeScriptConfigurationJson } from './TypeScriptPlugin/TypeScriptPlugin';
>>>>>>>
import { ITypeScriptConfigurationJson } from './TypeScriptPlugin/TypeScriptPlugin';
<<<<<<<
const copyStaticAssetsConfigurationJson:
| ICopyStatic... |
<<<<<<<
import DuskwalkersPatch from './modules/spells/shadowlands/legendaries/DuskwalkersPatch';
=======
import EssenceOfBloodfang from '../shared/shadowlands/legendaries/EssenceOfBloodfang';
>>>>>>>
import DuskwalkersPatch from './modules/spells/shadowlands/legendaries/DuskwalkersPatch';
import EssenceOfBloodfang ... |
<<<<<<<
public taskConfig: IKarmaTaskConfig = {
configPath: './karma.config.js',
testMatch: /.+\.test\.js?$/,
failBuildOnErrors: false
};
=======
constructor() {
super(
'karma',
{
configPath: './karma.config.js',
testMatch: /.+\.test\.js?$/
}
);
}
>>>>>>>... |
<<<<<<<
public ensure(versionPolicyName?: string, shouldCommit?: boolean): void {
this._ensure(versionPolicyName, shouldCommit);
}
public bump(versionPolicyName?: string,
bumpType?: BumpType,
identifier?: string,
shouldCommit?: boolean
): void {
// Bump all the lock step version policies.
... |
<<<<<<<
import RushConfiguration from '../../data/RushConfiguration';
import { Git } from './Git';
=======
import { RushConfiguration } from '../../data/RushConfiguration';
>>>>>>>
import { RushConfiguration } from '../../data/RushConfiguration';
import { Git } from './Git'; |
<<<<<<<
export class TypescriptCompiler extends RushStackCompilerBase {
=======
export interface ITypescriptCompilerOptions {
/**
* Option to pass custom arguments to the tsc command.
*/
customArgs?: string[];
}
/**
* @beta
*/
export class TypescriptCompiler extends RushStackCompilerBase<ITypescriptCompi... |
<<<<<<<
/**
* By default, rush passes --no-prefer-frozen-lockfile to 'pnpm install'.
* Set this option to true to pass '--frozen-lockfile' instead.
*/
usePnpmFrozenLockfileForRushInstall?: boolean;
=======
/**
* If true, the chmod field in temporary project tar headers will not be normalized.
*... |
<<<<<<<
this._versionManager = new VersionManager(
this.rushConfiguration,
userEmail,
this.rushConfiguration.versionPolicyConfiguration
);
=======
this._versionManager = new versionManagerModule.VersionManager(
this.rushConfiguration,
userEmail,
this.rushConfi... |
<<<<<<<
const cachedDocumentsRequest = new RequestType<void, {timestamp:number, documents:string[]}, void, void>('cachedDocuments');
const documentLanguageRangesRequest = new RequestType<{ textDocument: TextDocumentIdentifier }, LanguageRange[], void, void>('documentLanguageRanges');
=======
const knownDocumentsReque... |
<<<<<<<
import Ring = require('../ring');
import EffectSource = require('../EffectSource');
import { CardTypes, Locations } from '../Constants.js';
=======
import { CardTypes, EffectNames, Locations } from '../Constants.js';
>>>>>>>
import Ring = require('../ring');
import EffectSource = require('../EffectSource');
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.