conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
private createMedia(key: string, referenceId, dimensions, data: fs.ReadStream | Buffer, filePath?: string) {
const imageData = {
referenceId: referenceId,
stream: data,
path: filePath,
fileName: key,
dimensions: {
... |
<<<<<<<
export function loginAsync(parsed: commandParser.ParsedCommand) {
const access_token = parsed.arguments[0];
if (/^http/.test(access_token)) {
globalConfig.accessToken = access_token
saveConfig()
=======
export function loginAsync(...args: string[]) {
const token = args[0];
if (... |
<<<<<<<
import { Alignment, AlignmentType } from "./formatting/alignment";
import { Bidirectional } from "./formatting/bidirectional";
import { IBorderOptions, ThematicBreak } from "./formatting/border";
import { IIndentAttributesProperties, Indent } from "./formatting/indent";
import { KeepLines, KeepNext } from "./fo... |
<<<<<<<
},
{
id: "spriteWizard",
name: lf("Sprite Wizard"),
description: lf("Make a sprite using the new Sprite Wizard")
=======
},
{
id: "experimentalHw",
name: lf("Experimental Hardware"),... |
<<<<<<<
// import { TitlePage } from "./title-page/title-page";
=======
import { FooterReferenceType, IPageNumberTypeAttributes, PageNumberType, PageNumberFormat, PageBordersOptions, PageBorders } from ".";
import { HeaderReferenceType } from "./header-reference/header-reference-attributes";
>>>>>>>
import { FooterR... |
<<<<<<<
readonly style?: string;
=======
readonly borders?: ITableBordersOptions;
readonly alignment?: AlignmentType;
readonly visuallyRightToLeft?: boolean;
>>>>>>>
readonly style?: string;
readonly borders?: ITableBordersOptions;
readonly alignment?: AlignmentType;
readonly visually... |
<<<<<<<
for (let si of symbols) {
if (
/^__/.test(si.name) || // ignore members starting with __
=======
for (let nm of keys) {
const si = lastApiInfo.apis.byQName[nm]
if (/^__/.test(si.name) || // ignore members starting with... |
<<<<<<<
=======
'NonSystemVpnWarningDismissed', this.nonSystemVpnWarningDismissed.bind(this));
this.rootEl.addEventListener(
'AutoConnectDialogDismissed', this.autoConnectDialogDismissed.bind(this));
this.rootEl.addEventListener(
>>>>>>>
'AutoConnectDialogDismissed', this.autoConnectD... |
<<<<<<<
import { StoryRepository } from '../repositories/story.repository';
=======
import { PublishService } from '../services/publish.service';
import { DirectThreadRepository } from '../repositories/direct-thread.repository';
import { EntityFactory } from './entity.factory';
>>>>>>>
import { StoryRepository } fro... |
<<<<<<<
public story = new StoryRepository(this);
public directThread = new DirectThreadRepository(this);
=======
public user = new UserRepository(this);
public zr = new ZrRepository(this);
>>>>>>>
public story = new StoryRepository(this);
public user = new UserRepository(this);
public zr = new ZrRepos... |
<<<<<<<
fitView: (options: FitViewParams = { padding: 0.1 }) => {
const { elements, width, height, minZoom, maxZoom } = store.getState();
const nodes = elements.filter(isNode);
=======
fitView: (options: FitViewParams = { padding: DEFAULT_PADDING, includeHiddenNodes: false }) => {
... |
<<<<<<<
import { ProvisionRequest } from "./provisioning/ProvisionRequest";
=======
import { getBridgeVersion } from "./util/PackageInfo";
>>>>>>>
import { ProvisionRequest } from "./provisioning/ProvisionRequest";
import { getBridgeVersion } from "./util/PackageInfo"; |
<<<<<<<
this.clientPool = new ClientPool(this, this.dataStore);
if (this.config.ircService.debugApi.enabled) {
this.debugApi = new DebugApi(
this,
this.config.ircService.debugApi.port,
this.ircServers,
this.clientPool,
... |
<<<<<<<
import ResourcePackStatusType from '../type/ResourcePackStatusType';
import PacketHandler from './PacketHandler';
=======
>>>>>>>
import ResourcePackStatusType from '../type/ResourcePackStatusType';
import PacketHandler from './PacketHandler'; |
<<<<<<<
import {
setIntervalAsync,
clearIntervalAsync
} from 'set-interval-async/dynamic';
import RakNetListener from './RakNetListener';
=======
>>>>>>>
import RakNetListener from './RakNetListener'; |
<<<<<<<
const blockMeta = chunk.getBlockMetadata(
chunkPos.getX(),
chunkPos.getY(),
chunkPos.getZ()
);
const block = server
... |
<<<<<<<
import type Prismarine from '../../Prismarine';
import type PlayerActionPacket from '../packet/PlayerActionPacket';
import PlayerActionType from '../type/PlayerActionType';
=======
import PlayerAction from '../type/player-action';
import type PlayerActionPacket from '../packet/PlayerActionPacket';
import type... |
<<<<<<<
import {ModalWidgetStore} from "../stores/ModalWidgetStore";
=======
import {Analytics} from "../Analytics";
import UserActivity from "../UserActivity";
>>>>>>>
import {Analytics} from "../Analytics";
import UserActivity from "../UserActivity";
import {ModalWidgetStore} from "../stores/ModalWidgetStore";
<<... |
<<<<<<<
[UIFeature.IdentityServer]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
=======
[UIFeature.Voip]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
[UIFeature.Feedback]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
... |
<<<<<<<
[UIFeature.Voip]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
=======
[UIFeature.Feedback]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
},
>>>>>>>
[UIFeature.Voip]: {
supportedLevels: LEVELS_UI_FEATURE,
default: true,
... |
<<<<<<<
import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
=======
import { WidgetType } from "../../widgets/WidgetType";
import { EventType } from "matrix-js-sdk/src/@types/event";
>>>>>>>
import { OIDCState, WidgetPermissionStore } from "./WidgetPermissionStore";
import { WidgetType } from... |
<<<<<<<
AdvancedSettings = "UIFeature.advancedSettings",
=======
Voip = "UIFeature.voip",
Feedback = "UIFeature.feedback",
Registration = "UIFeature.registration",
PasswordReset = "UIFeature.passwordReset",
Deactivate = "UIFeature.deactivate",
ShareQRCode = "UIFeature.shareQrCode",
Sha... |
<<<<<<<
import {ModalManager} from "../Modal";
=======
import {IntegrationManagers} from "../integrations/IntegrationManagers";
>>>>>>>
import {IntegrationManagers} from "../integrations/IntegrationManagers";
import {ModalManager} from "../Modal";
<<<<<<<
singletonModalManager: ModalManager;
// TOD... |
<<<<<<<
Communities = "UIFeature.communities",
=======
AdvancedSettings = "UIFeature.advancedSettings",
>>>>>>>
Communities = "UIFeature.communities",
AdvancedSettings = "UIFeature.advancedSettings", |
<<<<<<<
Voip = "UIFeature.voip",
=======
Feedback = "UIFeature.feedback",
>>>>>>>
Voip = "UIFeature.voip",
Feedback = "UIFeature.feedback", |
<<<<<<<
import { exec } from 'child_process';
// import { dirObj } from './main';
//let directoryGlobal;
=======
import { exec } from 'child_process';
>>>>>>>
import { exec } from 'child_process';
// import { dirObj } from './main';
//let directoryGlobal;
<<<<<<<
// console.log("looping through looking for ... |
<<<<<<<
import U from '../Core/Utilities.js';
=======
import Math3D from '../parts-3d/Math.js';
const { perspective } = Math3D;
import U from '../parts/Utilities.js';
>>>>>>>
import Math3D from '../parts-3d/Math.js';
const { perspective } = Math3D;
import U from '../Core/Utilities.js'; |
<<<<<<<
* @sample {highcharts} highcharts/xaxis/zoomenabled/
* Zoom enabled
=======
* @sample {highcharts} highcharts/xaxis/xaxis/zoomenabled/
* Zoom enabled is false
>>>>>>>
* @sample {highcharts} highcharts/xaxis/zoomenabled/
* Zoom enab... |
<<<<<<<
class GanttChart extends Chart {
/**
* Initializes the chart. The constructor's arguments are passed on
* directly.
*
* @function Highcharts.GanttChart#init
*
* @param {Highcharts.Options} userOptions
* Custom options.
*
* @param {Function} [callback]
... |
<<<<<<<
startAngleRad: number;
=======
clipCircle: SVGElement;
>>>>>>>
startAngleRad: number;
clipCircle: SVGElement; |
<<<<<<<
* crisp, cropThreshold, colorAxis, colorKey, depth,
* edgeColor, edgeWidth, findNearestPointBy, grouping,
* groupPadding, groupZPadding, maxPointWidth, negativeColor,
* pointInterval, pointIntervalUnit, pointPadding,
* ... |
<<<<<<<
import type SVGAttributes from '../Core/Renderer/SVG/SVGAttributes';
=======
import type {
PointOptions,
PointShortOptions
} from '../Core/Series/PointOptions';
import type Series from '../Core/Series/Series.js';
import type SeriesOptions from '../Core/Series/SeriesOptions';
>>>>>>>
import type SVGA... |
<<<<<<<
class SVGElement {
public constructor();
[key: string]: any;
public element: (HTMLDOMElement|SVGDOMElement);
public parentGroup?: SVGElement;
public pathArray?: SVGPathArray;
public r?: number;
public renderer: SVGRender... |
<<<<<<<
fill: '${palette.neutralColor10}'
}, AST.filterUserAttributes(hoverState || {}));
=======
fill: palette.neutralColor10
}, hoverState);
>>>>>>>
fill: palette.neutralColor10
}, AST.filterUserAttributes(hoverState || {})); |
<<<<<<<
=======
// eslint-disable-next-line valid-jsdoc
/** @ignore-option */
>>>>>>>
<<<<<<<
/**
* @ignore-options
* @private
*/
lineWidth: undefined, // #12222
=======
/** @ignore-options */
lineWidth: void 0, // #12222
>>>>>>>... |
<<<<<<<
import Color from '../parts/Color.js';
const color = Color.parse;
=======
import type SVGPath from '../parts/SVGPath';
>>>>>>>
import type SVGPath from '../parts/SVGPath';
import Color from '../parts/Color.js';
const color = Color.parse; |
<<<<<<<
start: function (this: Highcharts.NavigationBindings, e: Highcharts.PointerEventObject): Annotation {
=======
start: function (this: NavigationBindings, e: Highcharts.PointerEventObject): Highcharts.Annotation {
>>>>>>>
start: function (this: NavigationBindings, e: Highcharts.PointerE... |
<<<<<<<
type DataGroupingApproximationValue = (
'average'|'averages'|'ohlc'|'open'|'high'|'low'|'close'|'sum'|
'windbarb'
);
=======
>>>>>>> |
<<<<<<<
import multipleLinesMixin from '../../mixins/multipe-lines.js';
import requiredIndicator from '../../mixins/indicator-required.js';
=======
import multipleLinesMixin from '../../mixins/multiple-lines.js';
import requiredIndicatorMixin from '../../mixins/indicator-required.js';
>>>>>>>
import multipleLinesMix... |
<<<<<<<
* @excluding animationLimit, boostThreshold, colorAxis, colorKey,
* connectEnds, connectNulls, cropThreshold, dashStyle,
* findNearestPointBy, getExtremesFromAll, marker, negativeColor,
* pointPlacement, shadow, softThreshold, stacking, states, step,
* ... |
<<<<<<<
import type WaterfallPoint from '../Series/Waterfall/WaterfallPoint';
=======
import type XRangePoint from '../Series/XRange/XRangePoint';
>>>>>>>
import type WaterfallPoint from '../Series/Waterfall/WaterfallPoint';
import type XRangePoint from '../Series/XRange/XRangePoint'; |
<<<<<<<
=======
import Color from '../parts/Color.js';
const color = Color.parse;
import SVGElement from '../parts/SVGElement.js';
import SVGRenderer from '../parts/SVGRenderer.js';
import U from '../parts/Utilities.js';
const {
addEvent,
createElement,
css,
defined,
discardElement,
erase,
... |
<<<<<<<
import type SVGPath from '../../parts/SVGPath';
import controllableMixin from './controllableMixin.js';
import H from '../../parts/Globals.js';
import MockPoint from '../MockPoint.js';
import Tooltip from '../../parts/Tooltip.js';
import U from '../../parts/Utilities.js';
const {
extend,
format,
is... |
<<<<<<<
=======
/**
* Get stock-specific default axis options.
*
* @private
* @function getDefaultAxisOptions
* @param {string} type
* @param {Highcharts.AxisOptions} options
* @return {Highcharts.AxisOptions}
*/
function getDefaultAxisOptions(
type: string,
options: Highcharts.AxisOptions
): DeepPart... |
<<<<<<<
categoryAndDatetimeMap = getCategoryAndDateTimeMap(
series,
pointArrayMap
),
mockSeries: Highcharts.ExportingSeries,
=======
mockSeries: Highcharts.ExportDataSeries,
>>>>>>>
categoryAndDatetimeMap = getCategoryAndDate... |
<<<<<<<
this.horiz ? [
['M', pos - 4, this.top - 6],
['L', pos + 4, this.top - 6],
['L', pos, this.top],
['Z']
=======
axis.horiz ? [
'M',
pos - 4, top - 6,
... |
<<<<<<<
dateBox,
inputGroup = this.inputGroup;
=======
dateBox;
>>>>>>>
dateBox;
<<<<<<<
if (value !== input.previousValue && isNumber(value)) {
input.previousValue = value;
=======
const { maxInput, minInput } = rangeSelector... |
<<<<<<<
import type BrokenAxis from '../../modules/broken-axis.src';
=======
import type DateTimeAxis from '../DateTimeAxis';
>>>>>>>
import type BrokenAxis from '../../modules/broken-axis.src';
import type DateTimeAxis from '../DateTimeAxis';
<<<<<<<
brokenAxis?: BrokenAxis['brokenAxis'];
=======
dateTim... |
<<<<<<<
this.applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii << 1, firstFrame);
} else
timeline.apply(skeleton, animationLast, animationTime, events, mix, timelineBlend, MixDirection.in);
=======
this.applyRotateTimeline(timeline, skeleton, a... |
<<<<<<<
client.getNativeClient().sendCommand("HelloWorld");
},
() => nodecg.log.info("AHK client has been unset."),
);
=======
client.getRawClient().sendCommand("HelloWorld");
});
ahk?.onUnavailable(() => nodecg.log.info("AHK client has been unset."));
>>>>>>>
... |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-... |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-... |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-... |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { emptySuccess, Result, success... |
<<<<<<<
import { ServiceProvider, ServiceClient } from "nodecg-io-core/extension/types";
import { emptySuccess, success, Result } from "nodecg-io-core/extension/utils/result";
=======
import { emptySuccess, Result, success } from "nodecg-io-core/extension/utils/result";
>>>>>>>
import { ServiceClient } from "nodecg-... |
<<<<<<<
}
export interface RefreshTokenMiddleware {
value: string | null
type: 'query' | 'cookie' | null
}
export interface RequestExtended extends Request {
refresh_token?: RefreshTokenMiddleware
permission_variables?: PermissionVariables
=======
}
export interface SetNewEmailData {
update_auth_accounts... |
<<<<<<<
await this.waitForDeploymentCompletion(this.taskParameters.applicationName, deploymentId);
=======
await this.waitForDeploymentCompletion(taskParameters.applicationName, deploymentId, taskParameters.timeoutInMins);
>>>>>>>
await this.waitForDeploymentCompletion(this.taskParameters.app... |
<<<<<<<
attribute: process.env.QAW_ATTRIBUTE || "data-qa,data-test,data-testid",
browser: getBrowserType(process.env.QAW_BROWSER || "chromium"),
=======
attribute:
process.env.QAW_ATTRIBUTE || "data-cy,data-qa,data-test,data-testid",
>>>>>>>
attribute:
process.env.QAW_ATTRIBUTE || "data-cy,data-qa,da... |
<<<<<<<
createTest,
countPendingTests,
=======
createTestAndTestTriggers,
countIncompleteTests,
>>>>>>>
createTest,
countIncompleteTests, |
<<<<<<<
const buildTypeStep = ({
allEvents,
firstEvent,
value
}: BuildTypeStepOptions): Step => {
return {
action: "type",
cssSelector: firstEvent.cssSelector,
html: firstEvent.target,
// include event index so we can sort in buildSteps
index: allEvents.indexOf(firstEvent),
page: firstEv... |
<<<<<<<
return (
isMouseDownEvent(event) || isScrollEvent(event) || isInputEvent(event)
);
=======
return isClickEvent(event) || isScrollEvent(event) || isTypeEvent(event);
>>>>>>>
return isClickEvent(event) || isInputEvent(event) || isScrollEvent(event);
<<<<<<<
if (isInputEvent(event)) ret... |
<<<<<<<
import "../../../components/ha-paper-icon-button-arrow-prev";
import { haStyle } from "../../../resources/ha-style";
=======
import { haStyle } from "../../../resources/styles";
>>>>>>>
import "../../../components/ha-paper-icon-button-arrow-prev";
import { haStyle } from "../../../resources/styles"; |
<<<<<<<
import { NbSidebarService, NbToggleModule } from '@nebular/theme';
import { isPlatformBrowser, Location } from '@angular/common';
=======
import { NbSidebarService } from '@nebular/theme';
import { DOCUMENT, isPlatformBrowser, Location } from '@angular/common';
>>>>>>>
import { NbSidebarService, NbToggleModu... |
<<<<<<<
=======
entryComponents: [
CommunityFormsListStatsComponent,
CommunityFormsListActionsComponent,
CookieConsentComponent
// EmailerComponent
],
>>>>>>>
entryComponents: [
CookieConsentComponent
// EmailerComponent
], |
<<<<<<<
NbUserModule,
NbSidebarModule.forRoot()
=======
NbUserModule
],
exports: [
LabDisplayCardComponent
>>>>>>>
NbUserModule,
NbSidebarModule.forRoot()
],
exports: [
LabDisplayCardComponent |
<<<<<<<
import {CookieConsentService} from './services/cookie-consent.service';
import {Component, Inject, OnInit, PLATFORM_ID} from '@angular/core';
import {ApiRoutesService} from 'projects/shared-services/api-routes.service';
import {environment} from '../environments/environment';
import {LibAuthwatchService} from '... |
<<<<<<<
/** control for the selected bank for server side filtering */
public bankServerSideCtrl: FormControl = new FormControl();
/** control for filter for server side. */
public bankServerSideFilteringCtrl: FormControl = new FormControl();
=======
/** control for the selected bank for option groups *... |
<<<<<<<
const ethjsUtil = require('ethjs-util')
const {
privateKeyVerify,
publicKeyCreate,
publicKeyVerify,
publicKeyConvert,
} = require('ethereum-cryptography/secp256k1')
=======
import * as ethjsUtil from 'ethjs-util'
>>>>>>>
import * as ethjsUtil from 'ethjs-util'
const {
privateKeyVerify,
publicKeyC... |
<<<<<<<
const settings: any = { enableInlineErrorMessages: true }
const sut = new JestExt(null, projectWorkspace, channelStub, settings)
=======
const settings: any = {
debugCodeLens: {},
enableInlineErrorMessages: true,
}
const sut = new JestExt(projectWorkspace, channel... |
<<<<<<<
runtimeImports: Set<string>;
=======
usedEnums: { [name: string]: TypeID };
usedFragments: Set<string>;
>>>>>>>
runtimeImports: Set<string>;
usedEnums: { [name: string]: TypeID };
usedFragments: Set<string>; |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
this.missionStatus = json.missionStatus;
this.vehicleLocation = json.vehicleLocation;
}
>>>>>>>
public getProtocolTypes() {
... |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(json: any): void {
super.deserialize(json... |
<<<<<<<
/**
* Time, in milliseconds, the timer should delay in between reask kafka for new events.
*/
kafkaBrowserPollingInterval?: number;
kafkaBrowserRequestTimeout?: number;
/**
* Blockchain type (local/test/main). for using local blockchain, you must specify contracts.
*/
=======
... |
<<<<<<<
new GraphQLFixture(languages.PikeLanguage),
new GraphQLFixture(languages.HaskellLanguage),
=======
new GraphQLFixture(languages.PikeLanguage),
new CommandSuccessfulLanguageFixture(languages.JavaScriptPropTypesLanguage),
>>>>>>>
new GraphQLFixture(languages.PikeLanguage),
new GraphQLFixture(langua... |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
this.startLocation = json.startLocation;
this.endLocation = json.endLocation;
this.vehicleType = json.vehicleType;
this.maxAl... |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(json: any): void {
super.deserialize(json... |
<<<<<<<
public getProtocolTypes() {
return ProtocolTypes;
}
=======
public deserialize(json: any): void {
super.deserialize(json);
this.missionStatus = json.missionStatus;
}
>>>>>>>
public getProtocolTypes() {
return ProtocolTypes;
}
public deserialize(... |
<<<<<<<
export default class TSFilter extends stream.Duplex {
=======
interface BasicExtState {
basic: {
flags: FlagState[];
lastFlagsId: number;
}
extended: {
flags: FlagState[];
lastFlagsId: number;
}
}
interface FlagState {
flag: Buffer;
ignore: Buffer;
... |
<<<<<<<
private bridge: Bridge;
private dataPromise: Promise<IMetaJSON>;
=======
public bridge: Bridge;
>>>>>>>
public bridge: Bridge;
private dataPromise: Promise<IMetaJSON>;
<<<<<<<
private addBridgeProtocol() {
protocol.registerStringProtocol('cmd', this.bridge.getProtocolHandler(... |
<<<<<<<
GherkinQueryContext,
CucumberQueryContext,
SearchQueryContext,
EnvelopesQueryContext,
=======
EnvelopesQuery,
FilteredResults,
filterByStatus,
>>>>>>>
GherkinQueryContext,
CucumberQueryContext,
SearchQueryContext,
EnvelopesQueryContext,
EnvelopesQuery,
FilteredResults,
filterBySta... |
<<<<<<<
export * from './models/bank-slip';
export * from './models/debit-card';
=======
export * from './models/bank-slip';
export * from './models/eletronic-transfer';
>>>>>>>
export * from './models/bank-slip';
export * from './models/debit-card';
export * from './models/eletronic-transfer'; |
<<<<<<<
import { SettingsService } from './settings';
=======
import * as obs from '../../obs-api';
>>>>>>>
import { SettingsService } from './settings';
import * as obs from '../../obs-api'; |
<<<<<<<
platforms: ['twitch', 'mixer', 'facebook'],
=======
platforms: ['twitch'],
>>>>>>>
platforms: ['twitch', 'facebook'], |
<<<<<<<
min: this.value.minVal,
max: this.value.maxVal,
=======
title: this.value.description,
>>>>>>>
min: this.value.minVal,
max: this.value.maxVal,
title: this.value.description, |
<<<<<<<
await (await client.$("h1=You're live!")).waitForDisplayed({ timeout: 60000 });
=======
await client.waitForVisible("h1=You're live!", 60000);
await stopStream(t);
>>>>>>>
await (await client.$("h1=You're live!")).waitForDisplayed({ timeout: 60000 });
await stopStream(t);
<<<<<<<
await (await cl... |
<<<<<<<
getTypes(): IListOption<ETransitionType>[] {
const types = [
{ title: $t('Cut'), value: ETransitionType.Cut },
{ title: $t('Fade'), value: ETransitionType.Fade },
{ title: $t('Swipe'), value: ETransitionType.Swipe },
{ title: $t('Slide'), value: ETransitionType.Slide },
{ tit... |
<<<<<<<
import { AppService } from 'services/app';
=======
import ResizeBar from 'components/shared/ResizeBar.vue';
>>>>>>>
import { AppService } from 'services/app';
import ResizeBar from 'components/shared/ResizeBar.vue';
<<<<<<<
@Inject() appService: AppService;
=======
>>>>>>>
@Inject() private appServic... |
<<<<<<<
import { Component, Input, Output, EventEmitter, TemplateRef, ViewChild, HostListener } from '@angular/core';
import { Observable } from 'rxjs';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { noop } from 'rxjs/util/noop';
=======
import {Component, Input, Output, EventEmitt... |
<<<<<<<
public importLuaLibFeature(feature: LuaLibFeature) {
// TODO inline imported features in output i option set
this.luaLibFeatureSet.add(feature);
}
public getAbsouluteImportPath(relativePath: string) {
=======
public getAbsoluteImportPath(relativePath: string) {
>>>>>>>
pu... |
<<<<<<<
path: 'rule-engine',
name: '规则引擎',
icon: 'share-alt',
authority: ['rule-model', 'rule-instance'],
routes: [
{
path: '/rule-engine/model',
name: '规则模型',
icon: 'appstore',
... |
<<<<<<<
import {PortofinoModule, Page, CrudComponent, NAVIGATION_COMPONENT, NavigationComponent, DefaultNavigationComponent, PortofinoComponent} from "portofino";
import {
MatAutocompleteModule,
MatButtonModule, MatCheckboxModule, MatDatepickerModule, MatDialogModule,
MatFormFieldModule,
MatIconModule, MatInput... |
<<<<<<<
import {PortofinoModule, PageComponent} from "portofino";
import {RouterModule} from "@angular/router";
=======
import {RouterModule} from '@angular/router';
import {PortofinoModule} from "./portofino.module";
import {PortofinoAppComponent} from "./portofino-app.component";
import {PageComponent} from "./page... |
<<<<<<<
import {Operation, Page, PageConfiguration} from "../page";
import {AuthenticationService} from "../security/authentication.service";
import {Router} from "@angular/router";
import {Button} from "../buttons";
=======
import {Button, Operation, Page, PageConfiguration} from "../page.component";
import {Notific... |
<<<<<<<
import {BigNumber} from 'bignumber.js'
import { checkAddress } from 'nanocurrency';
=======
import {BigNumber} from 'bignumber.js';
import * as nanocurrency from 'nanocurrency';
>>>>>>>
import {BigNumber} from 'bignumber.js';
import * as nanocurrency from 'nanocurrency';
<<<<<<<
isValidAccount: isValidA... |
<<<<<<<
import { SweeperComponent } from './components/sweeper/sweeper.component';
=======
import { QrScanComponent } from './components/qr-scan/qr-scan.component';
>>>>>>>
import { SweeperComponent } from './components/sweeper/sweeper.component';
import { QrScanComponent } from './components/qr-scan/qr-scan.compone... |
<<<<<<<
// Remote signing
accounts = this.wallet.wallet.accounts;
addressBookResults$ = new BehaviorSubject([]);
showAddressBook = false;
addressBookMatch = '';
amounts = [
{ name: 'NANO (1 Mnano)', shortName: 'NANO', value: 'mnano' },
{ name: 'knano (0.001 Mnano)', shortName: 'knano', value: 'knano... |
<<<<<<<
import { Telemetry, ClientInfo } from "./telemetry";
import type * as ChartJs from "chart.js";
import { DisplayableState, createBarChart, createBarChartRealImagOption, createBarChartAmplitudePhaseOption, attachDumpMachineToolbar, createNewCanvas, PlotStyle, updateChart } from "./plotting";
import { defineQSharp... |
<<<<<<<
public roomJoinMessageParser(rawPayload: PadchatMessagePayload): RoomJoinPayload {
const roomJoinPayload
= roomJoin.inviteeNameList
const inviterName = roomJoin.inviterName
const roomId = roomJoin.roomId
}
public roomLeaveMessageParser(rawPayload: PadchatMessagePa... |
<<<<<<<
public reply(message: Message, replyContent: string) {
log.warn('PuppetWeb', 'reply() @deprecated, please use Message.say()')
=======
/**
* Bot say...
* send to `filehelper` for notice / log
*/
public say(content: string) {
const m = new Message()
m.to('filehelper')
m.content(c... |
<<<<<<<
'wechaty-puppet-padpro' : '^0.3.7', // https://www.npmjs.com/package/wechaty-puppet-padpro
'wechaty-puppet-puppeteer' : '^0.17.14', // https://www.npmjs.com/package/wechaty-puppet-puppeteer
=======
'wechaty-puppet-padpro' : '^0.2.0', // https://www.npmjs.com/package/wechaty-puppet-padpro
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.