conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import { StructureParams, StructureMeshParams, StructureTextParams, StructureDirectVolumeParams, StructureLinesParams, StructureCylindersParams } from './params';
=======
import { StructureParams, StructureMeshParams, StructureTextParams, StructureDirectVolumeParams, StructureLinesParams, StructureTextureMesh... |
<<<<<<<
import { paramDefaultValues } from 'mol-util/parameter';
=======
import { ParamDefinition as PD } from 'mol-util/param-definition';
>>>>>>>
import { ParamDefinition as PD } from 'mol-util/param-definition';
<<<<<<<
=======
sizeTheme: PD.Select<SizeThemeName>('Size Theme', '', 'physical', SizeThemeOpti... |
<<<<<<<
import { SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
=======
import { SizeTheme, SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
import { ParamDefinition as PD } from 'mol-util/param-definition';
>>>>>>>
... |
<<<<<<<
import { paramDefaultValues, NumberParam } from 'mol-util/parameter';
=======
import { ParamDefinition as PD } from 'mol-util/param-definition';
>>>>>>>
import { ParamDefinition as PD } from 'mol-util/param-definition';
<<<<<<<
radialSegments: NumberParam('Radial Segments', '', 16, 3, 56, 1),
=======
... |
<<<<<<<
import "./hello.js"
import "./less/styles.less";
declare const FuseBox: any;
let results = FuseBox.import("./batch/*")
console.log(results, " ");
=======
import "./styles.css"
console.log(1);
>>>>>>>
import "./styles.css"
import "./less/styles.less";
console.log(1); |
<<<<<<<
public entryPackageName: string;
public entryPackageFile: string;
=======
private chokidarOptions: any;
>>>>>>>
public entryPackageName: string;
public entryPackageFile: string;
private chokidarOptions: any;
<<<<<<<
=======
if (opts) {
this.chokidarOptions =... |
<<<<<<<
import { LESSPlugin } from './plugins/LESSPlugin';
=======
export { PostCSS } from "./plugins/PostCSSPlugin";
>>>>>>>
import { LESSPlugin } from './plugins/LESSPlugin';
export { PostCSS } from "./plugins/PostCSSPlugin";
<<<<<<<
export { LESSPlugin } from "./plugins/LESSPlugin";
=======
>>>>>>>
export {... |
<<<<<<<
import { UserOutput } from "./UserOutput";
import { BundleProducer } from "./BundleProducer";
import { Bundle } from "./Bundle";
=======
const isWin = /^win/.test(process.platform);
>>>>>>>
import { UserOutput } from "./UserOutput";
import { BundleProducer } from "./BundleProducer";
import { Bundle } from "... |
<<<<<<<
TMDBPagination,
=======
Entertainment,
TMDBRequestParams,
>>>>>>>
TMDBPagination,
Entertainment,
TMDBRequestParams,
<<<<<<<
private async request<TData>(
path: string,
params: {
query?: string;
language?: string;
region?: string;
year?: number;
with_genres... |
<<<<<<<
@Field({ nullable: true }) public page?: number;
=======
@Field((_type) => Entertainment) public entertainment: Entertainment =
Entertainment.Movie;
>>>>>>>
@Field({ nullable: true }) public page?: number;
@Field((_type) => Entertainment) public entertainment: Entertainment =
Entertainment.Mo... |
<<<<<<<
gridMenuCustomItems.push(
{
iconCssClass: this.sharedService.gridOptions.gridMenu.iconClearAllFiltersCommand || 'fa fa-filter text-danger',
title: this.sharedService.gridOptions.enableTranslate ? this.translate.instant('CLEAR_ALL_FILTERS') : this._locales && this._local... |
<<<<<<<
import DescriptorProto = google.protobuf.DescriptorProto;
import FieldDescriptorProto = google.protobuf.FieldDescriptorProto;
import FileDescriptorProto = google.protobuf.FileDescriptorProto;
import EnumDescriptorProto = google.protobuf.EnumDescriptorProto;
import ServiceDescriptorProto = google.protobuf.Servic... |
<<<<<<<
"Reveal in Finder": ["reveal_folder", undefined, ""],
"Force Reimport": ["force_reimport", undefined, ""],
=======
[showInFs]: ["reveal_folder", undefined, ""],
>>>>>>>
"Force Reimport": ["force_reimport", undefined, ""],
[showInFs]: ["reveal_folder", undefined, ""], |
<<<<<<<
public static infoWindowTemplete: Property;
=======
public static paddingProperty: Property;
>>>>>>>
public static paddingProperty: Property;
public static infoWindowTemplete: Property; |
<<<<<<<
export class MenuInfo {
name?: string;
siteId?: string;
isPublish?: boolean;
isLocked?: boolean;
}
=======
export class UpdatePermissionInput {
code?: string;
description?: string;
}
>>>>>>>
export class MenuInfo {
name?: string;
siteId?: string;
isPublish?: boolean;
... |
<<<<<<<
pubSub.publish('menuPublished', { menuPublished: menu.isPublished })
return (await this.menuRepository.save(menu)) ? true : false
=======
pubSub.publish('menuSubscription', { menuSubscription: menu })
return await this.menuRepository.save(menu) ? true : false
>>>>>>>
pubSub.publish('menuSubscr... |
<<<<<<<
private calculateFolderSize(folder: IFolder): Promise<IFolder> {
return new Promise((resolve, reject) => {
fileService
.getFolderSize(folder.path)
.then((size: any) => {
folder.size = +size;
resolve(folder);
})
.catch(err => reject(err));
=======
... |
<<<<<<<
export const getTitle = createSelector(getReportsState, fromReports.getTitle);
export const getReportSearchTerm = createSelector(getReportsState, fromReports.getReportSearchTerm);
export const getFieldSearchTerm = createSelector(getReportsState, fromReports.getFieldSearchTerm);
export const getRelationsSearchTe... |
<<<<<<<
title$ = this.store.select(getTitle);
sortReportsBy$ = Observable.combineLatest(
this.store.select(getSortTerm),
this.store.select(getReports),
this.store.select(getSortOrder),
sortReports
);
=======
>>>>>>>
title$ = this.store.select(getTitle); |
<<<<<<<
[Symbol.iterator](): Iterator<[K, V]>;
=======
// Sequence algorithms
/**
* Returns a new Iterable.Keyed with values passed through a
* `mapper` function.
*
* Iterable.Keyed({a: 1, b: 2}).map(x => 10 * x)
* // Iterable.Keyed {a: 10, b: 20}
... |
<<<<<<<
export declare const setdata: unique symbol;
export declare const datakey: unique symbol;
export declare const isLock: unique symbol;
=======
export declare const setdata: symbol;
export declare const isLock: symbol;
>>>>>>>
export declare const setdata: symbol;
export declare const datakey: symbol;
export d... |
<<<<<<<
=======
public synchronizeScenes(): Promise<IScene[]> {
return this.getScenes()
.then(res => this.state.addScenes(res.scenes));
}
public ready(isReady: boolean = true): Promise<any> {
return this.execute('ready', { isReady }, false);
}
>>>>>>>
public synchron... |
<<<<<<<
import { skip } from 'rxjs/operators';
import { getValue, isFunction, setValue } from '../internal/utils';
=======
import { skip, filter } from 'rxjs/operators';
import { getValue, setValue } from '../internal/utils';
>>>>>>>
import { skip, filter } from 'rxjs/operators';
import { getValue, setValue, isFunct... |
<<<<<<<
const statusCode = mockResponse.status || 200;
const jsonCallbackName = this.getJsonCallbackName(request.url);
let headers, chunk;
=======
if (mockResponse !== undefined) {
const statusCode = mockResponse.status || 200;
... |
<<<<<<<
uid?: string = '';
type?: 'private'|'public' = 'public';
title?: string = '';
description?: string = '';
access?: AccessModel = new AccessModel();
repositories?: string[] = [];
createdOn?: Date;
updatedOn: Date;
constructor(uid: string = '') {
this.uid = uid;
}
... |
<<<<<<<
issues?: number;
license?: {
name: string;
};
=======
license?: string;
>>>>>>>
license?: {
name: string;
}; |
<<<<<<<
TacoPackageLoader.lazyRequire<typeof Cordova>("cordova", "cordova@" + cordovaVersion, buildInfo.logLevel).done(function (pkg: typeof Cordova): void {
cordova = pkg;
cordova.on("results", Logger.log);
cordova.on("log", Logger.log);
cordova.on("warn", console.warn);
co... |
<<<<<<<
import LoggerHelper = tacoUtility.LoggerHelper;
=======
import level = logger.Level;
import tacoProjectHelper = projectHelper.TacoProjectHelper;
>>>>>>>
import LoggerHelper = tacoUtility.LoggerHelper;
import tacoProjectHelper = projectHelper.TacoProjectHelper; |
<<<<<<<
return gulpUtils.copyFiles(
[
"/**/package.json",
"/**/resources.json",
"/**/test/**",
"/**/commands.json",
"/**/TacoKitMetaData.json",
"/**/bin/**",
"/**/templates/**",
"/**/examples/**",
"/*... |
<<<<<<<
// templates.Kits = mockKitHelper;
done();
=======
templates.Kits = mockKitHelper;
// Delete existing run folder if necessary
rimraf(runFolder, function (err: Error): void {
if (err) {
done(err);
} else {
// Creat... |
<<<<<<<
CommandInstallCordovaTooOld,
CommandNotBothDeviceEmulate,
CommandNotBothLocalRemote,
CommandRemotePlatformNotKnown,
=======
>>>>>>>
CommandInstallCordovaTooOld, |
<<<<<<<
private static cleanPlatformsIfNecessary(platforms: PlatformHelper.IPlatformWithLocation[], commandData: commands.ICommandData): Q.Promise<any> {
if (commandData.options["clean"]) {
return CleanHelper.cleanPlatforms(platforms, commandData);
}
return Q({});
}
pri... |
<<<<<<<
import stylecopUtil = require ("../tools/stylecop-util");
import gulpUtils = require("../tools/GulpUtils");
=======
import stylecopUtil = require ("../tools/stylecopUtil");
import tsUtil = require ("./taco-cli/compile/typeScriptServices");
import gulpUtils = require ("../tools/GulpUtils");
>>>>>>>
import sty... |
<<<<<<<
public static createKitProjectWithTemplate(kitId: string, templateId: string, cordovaCli: string, path: string, appId?: string, appName?: string, cordovaConfig?: string, options?: { [option: string]: any }): Q.Promise<string> {
=======
public static createKitProjectWithTemplate(kitId: string, template... |
<<<<<<<
private static cordovaCommandName: string = os.platform() === "win32" ? "cordova.cmd" : "cordova";
private static CORDOVA_CHECK_REQS_MIN_VERSION: string = "5.1.1";
private static CORDOVA_NPM_PACKAGE_NAME: string = "cordova";
=======
private static CordovaCommandName: string = os.platform() ===... |
<<<<<<<
gulp.src(path.join(buildConfig.src, "/**/commands.json")).pipe(gulp.dest(buildConfig.bin));
gulp.src(path.join(buildConfig.src, "/**/bin/**")).pipe(gulp.dest(buildConfig.bin));
=======
gulp.src(path.join(buildConfig.src, "/**/test/**")).pipe(gulp.dest(buildConfig.bin));
>>>>>>>
gulp.src(path.... |
<<<<<<<
res.status(err.code || 400).send({ status: self.resources.getStringForLanguage(req, "InvalidBuildRequest"), errors: err.toString() });
=======
res.status(err.code || 400).send({ status: self.resources.getStringForLanguage(req, "invalidBuildRequest"), errors: err });
>>>>>>>
... |
<<<<<<<
cordovaCli?: string;
templateDisplayName?: string;
isKitProject?: boolean;
kitId?: string;
=======
>>>>>>>
templateDisplayName?: string;
cordovaCli?: string;
isKitProject?: boolean;
kitId?: string;
<<<<<<<
.then(function (): Q.Promise<any> {
return sel... |
<<<<<<<
platforms: Settings.IPlatformWithLocation[], settings: Settings.ISettings): void {
var baseName: string = "platforms." + modifier + ".";
var remoteBaseName: string = baseName + "remote";
=======
platforms: PlatformHelper.IPlatformWithLocation[], settings: Settings.ISettings): v... |
<<<<<<<
ESN
} as Networks;
=======
ESN,
ARTIS_SIGMA1,
ARTIS_TAU1
};
>>>>>>>
ESN,
ARTIS_SIGMA1,
ARTIS_TAU1
} as Networks; |
<<<<<<<
/// <reference path="../typings/tacoHelpArgs.d.ts"/>
=======
/// <reference path="../typings/node.d.ts" />
/// <reference path="../typings/nopt.d.ts" />
/// <reference path="../typings/Q.d.ts" />
/// <reference path="../typings/rimraf.d.ts"/>
>>>>>>>
/// <reference path="../typings/node.d.ts" />
/// <referen... |
<<<<<<<
function sendPendingData(): Q.Promise<string>;
=======
function getSessionId(): string;
function setSessionId(sessionId: string): void;
>>>>>>>
function sendPendingData(): Q.Promise<string>;
function getSessionId(): string;
function setSessionId(sessionId: stri... |
<<<<<<<
export { ROUTE_PATHS } from './routePaths';
export { WALLET_INFO } from './walletInfo';
=======
export { ROUTE_PATHS } from './routePaths';
export { NETWORKS_CONFIG } from './networks';
export { ETHSCAN_NETWORKS } from './ethScan';
export { Fiats, AssetsData, ContractsData } from './cacheData';
export {
GAS... |
<<<<<<<
import TacoProjectHelper = projectHelper.TacoProjectHelper;
import telemetry = tacoUtility.Telemetry;
=======
>>>>>>>
import telemetry = tacoUtility.Telemetry;
<<<<<<<
TacoProjectHelper.cdToProjectRoot();
telemetry.init(require("../package.json").version);
=======
projectHelper.cdT... |
<<<<<<<
export * from './BuyAndExchange';
export * from './CreateWallet';
export * from './Dashboard';
export * from './DevTools';
export * from './DownloadApp';
export * from './Drawer';
export { AccountScreen, UnlockScreen } from './Drawer';
export * from './Home';
export * from './AddAccount';
export * from './Layou... |
<<<<<<<
var self = this;
=======
var self: TemplateManager = this;
var templateSrcPath: string = null;
>>>>>>>
var self: TemplateManager = this;
<<<<<<<
return TemplateManager.copyTemplateItemsToProject(cordovaParameters);
=======
/*
... |
<<<<<<<
import telemetry = tacoUtility.Telemetry;
var kitHelper = tacoKits.KitHelper;
=======
import kitHelper = tacoKits.KitHelper;
import TacoProjectHelper = projectHelper.TacoProjectHelper;
>>>>>>>
import kitHelper = tacoKits.KitHelper;
import TacoProjectHelper = projectHelper.TacoProjectHelper;
import telemetry ... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
private simpleTypesAllowedProperties = [
"type",
"description"
];
private addSimpleType(def: any, type: string) {
for (let k in def) {
if (this.simpleTypesAllowedProperties.indexOf(k) == -1)
... |
<<<<<<<
import { ReactionRolesPlugin } from "./ReactionRoles/ReactionRolesPlugin";
=======
import { AutomodPlugin } from "./Automod/AutomodPlugin";
>>>>>>>
import { ReactionRolesPlugin } from "./ReactionRoles/ReactionRolesPlugin";
import { AutomodPlugin } from "./Automod/AutomodPlugin"; |
<<<<<<<
PersistPlugin,
PingableRolesPlugin,
NameHistoryPlugin,
=======
>>>>>>>
PersistPlugin,
PingableRolesPlugin, |
<<<<<<<
const casesPlugin = this.getPlugin<CasesPlugin>("cases");
const priorWarnAmount = await casesPlugin.getCaseTypeAmountForUserId(memberToWarn.id, CaseTypes.Warn);
if (priorWarnAmount >= config.warn_notify_threshold) {
const tooManyWarningsMsg = await msg.channel.createMessage(
config.war... |
<<<<<<<
import { GuildInfoSaverPlugin } from "./GuildInfoSaver/GuildInfoSaverPlugin";
=======
import { CensorPlugin } from "./Censor/CensorPlugin";
import { RolesPlugin } from "./Roles/RolesPlugin";
import { SlowmodePlugin } from "./Slowmode/SlowmodePlugin";
import { StarboardPlugin } from "./Starboard/StarboardPlugi... |
<<<<<<<
import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry";
=======
import { LogType } from "src/data/LogType";
import { stripObjectToScalars, resolveUser } from "src/utils";
>>>>>>>
import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry"... |
<<<<<<<
assert.equal(container.connectionState, ConnectionState.Connected,
"Container should be in connected state!!");
assert.equal(container.id, documentId, "Doc id is not matching!!");
=======
assert.equal(container.id, "documentId", "Doc id is not matching!!");
>>>>>>>
... |
<<<<<<<
export { default as appRoutes } from './routes';
export * from './Ens';
=======
export { CreateWallet, Mnemonic, Keystore } from './CreateWallet';
export { Dashboard } from './Dashboard';
export { AddAccountFlow } from './AddAccount';
export { Settings, Import, Export } from './Settings';
export { DownloadApp... |
<<<<<<<
import { IRequest, IResponse, IComponent } from "@microsoft/fluid-component-core-interfaces";
import { IDocumentServiceFactory, IUrlResolver } from "@microsoft/fluid-driver-definitions";
=======
import { IBaseHostConfig } from "@microsoft/fluid-base-host";
import { MultiUrlResolver, MultiDocumentServiceFacto... |
<<<<<<<
nconf.argv().env(<any> "__").file(path.join(__dirname, "../../config/config.json")).use("memory");
=======
import * as winston from "winston";
nconf.argv().env(<any> "__").file(path.join(__dirname, "../../config.json")).use("memory");
>>>>>>>
import * as winston from "winston";
nconf.argv().env(<any> "__").f... |
<<<<<<<
=======
import { IDocumentDeltaConnection, IDocumentService, IFluidResolvedUrl } from "@microsoft/fluid-driver-definitions";
import { IClient, IDocumentMessage, MessageType, ScopeType } from "@microsoft/fluid-protocol-definitions";
>>>>>>>
<<<<<<<
import { CreationServerMessagesHandler } from "..";
=======... |
<<<<<<<
import { ChildLogger } from "@microsoft/fluid-core-utils";
import {
IDocumentService,
IDocumentServiceFactory,
IResolvedUrl,
} from "@microsoft/fluid-driver-definitions";
=======
import { IDocumentService, IDocumentServiceFactory, IResolvedUrl } from "@microsoft/fluid-protocol-definitions";
>>>>>>>
imp... |
<<<<<<<
=======
import { FatalError, ThrottlingError } from "@microsoft/fluid-driver-utils";
// eslint-disable-next-line import/no-internal-modules
import * as uuid from "uuid/v4";
>>>>>>>
// eslint-disable-next-line import/no-internal-modules
import * as uuid from "uuid/v4"; |
<<<<<<<
const odspResolvedUrl = resolvedUrl as IOdspResolvedUrl;
// A hint for driver if document was opened before by this factory
const docId = odspResolvedUrl.hashedDocumentId;
const isFirstTimeDocumentOpened = !this.documentsOpened.has(docId);
this.documentsOpened.add(docId)... |
<<<<<<<
import * as kafka from "kafka-rest";
=======
import * as kafka from "kafka-node";
import { debug } from "./debug";
>>>>>>>
import * as kafka from "kafka-rest";
import { debug } from "./debug";
<<<<<<<
=======
* Ensures that the provided topics are ready
*/
export function ensureTopics(client: kafka.Clie... |
<<<<<<<
connectionMode: this._deltaManager.connectionMode,
connectionState: this.connectionState,
=======
connectionMode: this._deltaManager!.connectionMode,
connectionState: ConnectionState[this.connectionState],
>>>>>>>
connectionMode: this._deltaManager.... |
<<<<<<<
/* Issue #1566: Backward compat */
if (response.initialMessages === undefined) {
response.initialMessages = [];
}
if (response.initialClients === undefined) {
response.initialClients = [];
}
... |
<<<<<<<
export { GithubService } from './Github';
=======
export { GithubService, OS } from './Github';
export { TokenInfoService } from './TokenInfo';
>>>>>>>
export { GithubService } from './Github';
export { TokenInfoService } from './TokenInfo'; |
<<<<<<<
name: 'RSK',
unit: 'RBTC',
=======
name: 'RSK Testnet',
unit: 'SBTC',
>>>>>>>
name: 'RSK Testnet',
unit: 'RBTC', |
<<<<<<<
// Return the deed owner's address, and the resolved address if it exists
const { deedOwnerAddress }: typeof ENS.deed.owner.outputType = yield call(makeEthCallAndDecode, {
=======
// Return the owner's address, and the resolved address if it exists
// NOTE: THE DEED OWNER IS NOT THE OWNER
// CHECK L... |
<<<<<<<
ConnectionState,
=======
IBlob,
>>>>>>>
ConnectionState,
IBlob, |
<<<<<<<
const gitManager = new git.GitManager(historian, gitSettings.repository);
const foo = routes.create(config, gitManager, mongoManager);
app.use("/deltas", foo.deltas);
app.use("/maps", foo.maps);
app.use("/canvas", foo.canvas);
app.use("/sharedText", foo.sharedText);
app.use("/cell", ... |
<<<<<<<
url: 'https://mainnet.infura.io/mycrypto'
=======
url: 'https://mainnet.infura.io/v3/c02fff6b5daa434d8422b8ece54c7286'
},
{
name: makeNodeName('ETH', 'blockscale'),
type: 'rpc',
service: 'Blockscale',
url: 'https://api.dev.blockscale.net/dev/parity'
>>>>>>>
u... |
<<<<<<<
import { EventEmitter } from "events";
import { IComponentRuntime, ISharedObjectServices } from "@microsoft/fluid-runtime-definitions";
=======
import { ITree } from "@microsoft/fluid-protocol-definitions";
import {
IComponentRuntime,
IObjectStorageService,
ISharedObjectServices,
IChannelAttri... |
<<<<<<<
import { ISequencedDocumentMessage } from "@prague/container-definitions";
import { ISharedMap } from "@prague/map";
=======
>>>>>>>
import { ISequencedDocumentMessage } from "@prague/container-definitions"; |
<<<<<<<
export class ContainerContext extends EventEmitter implements IContainerContext {
=======
export class ContainerContext implements IContainerContext {
public readonly isExperimentalContainerContext = true;
>>>>>>>
export class ContainerContext implements IContainerContext { |
<<<<<<<
};
export const Geeii: Contributor = {
nickname: 'Geeii',
github: 'radean0909',
discord: 'Geei#8447',
mains: [{
name: "Geeii",
spec: SPECS.VENGEANCE_DEMON_HUNTER,
link: "https://worldofwarcraft.com/en-us/character/us/area52/geeii",
}]
}
=======
mains: [{
name: "Nakofel",
spec... |
<<<<<<<
export const WEB_DEFAULT: DPath = {
label: 'Default (WEB)',
value: "m/44'/227'/0'/0"
};
=======
export const METADIUM_DEFAULT: DPath = {
label: 'Default (METADIUM)',
value: "m/44'/916'/0'/0"
};
>>>>>>>
export const WEB_DEFAULT: DPath = {
label: 'Default (WEB)',
value: "m/44'/227'/0'/0"
};
expo... |
<<<<<<<
import { fetchHelper, getWithRetryForTokenRefresh, throwOdspNetworkError } from "./odspUtils";
=======
import { fetchHelper, getWithRetryForTokenRefresh, IOdspResponse, throwOdspNetworkError } from "./odspUtils";
import { isOdcOrigin } from "./isOdc";
>>>>>>>
import { fetchHelper, getWithRetryForTokenRefresh... |
<<<<<<<
import { O } from 'ts-toolbelt';
import { PatchTypes } from '../../farming';
import { FarmingPatchTypes } from '../../farming/types';
import defaultContracts from '../../farming/defaultContracts';
import defaultTitheFarm from '../../farming/defaultTitheFarm';
=======
import { ItemBank } from '../../types';
>... |
<<<<<<<
// Scriptorium Lambda
this.scriptoriumLambda = new ScriptoriumLambda(
LocalOrderer.socketPublisher,
deltasCollection,
undefined,
LocalOrderer.scriptoriumContext);
=======
// Scriptorium + BBC Lambda
this.scriptoriumLambda = new Sc... |
<<<<<<<
FiremakingActivityTaskOptions,
WoodcuttingActivityTaskOptions,
OfferingActivityTaskOptions,
BuryingActivityTaskOptions,
FletchingActivityTaskOptions,
AlchingActivityTaskOptions,
FarmingActivityTaskOptions
=======
WoodcuttingActivityTaskOptions
>>>>>>>
WoodcuttingActivityTaskOptions
<<<<<<<
import F... |
<<<<<<<
${Emoji.Farming} Farming: ${msg.author.skillLevel(SkillsEnum.Farming)} (${msg.author.settings
.get(UserSettings.Skills.Farming)
.toLocaleString()} xp)
=======
${Emoji.XP} Total Level: ${msg.author.totalLevel().toLocaleString()} (${msg.author
.totalLevel(true)
.toLocaleString()} xp)
>>>>>>>
${Emoj... |
<<<<<<<
import * as mergeTree from "../merge-tree";
=======
import * as ink from "../ink";
>>>>>>>
import * as ink from "../ink";
import * as mergeTree from "../merge-tree";
<<<<<<<
* Creates a new collaborative string
*/
public createString(): types.ICollaborativeObject {
return this.create(m... |
<<<<<<<
export interface FarmingActivityTaskOptions extends ActivityTaskOptions {
plantsName: string | null;
channelID: string;
quantity: number;
upgradeType: 'compost' | 'supercompost' | 'ultracompost' | null;
patchType: PatchTypes.PatchData;
getPatchType: string;
planting: boolean;
currentDate: number;
}
exp... |
<<<<<<<
IChaincode,
IChannel,
=======
>>>>>>>
IChannel, |
<<<<<<<
import { CollectionInsertManyOptions } from "mongodb";
import * as nconf from "nconf";
import * as path from "path";
=======
>>>>>>>
import * as nconf from "nconf";
import * as path from "path"; |
<<<<<<<
const defaultThrottleMaxDelayMs = 30 * 1000;
const defaultThrottleDelayWindowMs = 60 * 1000;
const defaultThrottleDelayFunction = (n: number) => 20 * (Math.pow(2, n) - 1);
/**
* Used to give increasing delay times for throttling a single functionality.
* Delay is based on previous attempts within specified t... |
<<<<<<<
| TitheFarmActivityTaskOptions
=======
| DeliverPresentsActivityTaskOptions
>>>>>>>
| TitheFarmActivityTaskOptions
| DeliverPresentsActivityTaskOptions |
<<<<<<<
case Activity.Farming:
return Tasks.FarmingActivity;
case Activity.TitheFarm:
return Tasks.TitheFarmActivity;
=======
case Activity.DeliverPresents:
return Tasks.DeliverPresents;
>>>>>>>
case Activity.Farming:
return Tasks.FarmingActivity;
case Activity.TitheFarm:
return Tasks.TitheF... |
<<<<<<<
public indentWidth: number;
public contentWidth: number;
public rows = <RowView[]> [];
=======
public indentPct = 0.1;
public contentPct: 0.8;
public rows = <RowView[]>[];
public columns = <ColumnView[]>[];
>>>>>>>
public indentPct = 0.1;
public contentPct: 0.8;
public... |
<<<<<<<
import {Controller, Get, PathParams, PlatformTest} from "@tsed/common";
import {Returns} from "@tsed/schema";
=======
import {Controller, Description, Get, MergeParams, PathParams, PlatformTest} from "@tsed/common";
>>>>>>>
import {Controller, Get, MergeParams, PathParams, PlatformTest} from "@tsed/common";
... |
<<<<<<<
export * from "./middlewares/GlobalAcceptMimesMiddleware";
=======
export * from "./components/ServerLoader";
>>>>>>>
<<<<<<<
export * from "./decorators/responseView";
=======
export * from "./decorators/serverSettings";
export * from "./decorators/expressApplication";
export * from "./decorators/Express... |
<<<<<<<
return ParamFn(param => {
if (isParameterType(paramType)) {
param.parameter!.in(paramType);
}
=======
return ParamFn((param) => {
>>>>>>>
return ParamFn((param) => {
if (isParameterType(paramType)) {
param.parameter!.in(paramType);
} |
<<<<<<<
"get": {
"operationId": "queryParamsSwaggerControllerScenario1",
"parameters": [
=======
get: {
operationId: "QueryParamsSwaggerController.scenario1",
parameters: [
>>>>>>>
get: {
operationId: "queryParamsSwaggerControl... |
<<<<<<<
import {Ignore, Property} from "@tsed/schema";
import {expect} from "chai";
=======
import {expect} from "chai";
>>>>>>>
<<<<<<<
import {ConverterService} from "../../../src/mvc/services/ConverterService";
=======
>>>>>>> |
<<<<<<<
operationPaths.forEach(({path, method}) => {
if (!!method) {
=======
pathsMethods.forEach(({path, method}) => {
if (method) {
>>>>>>>
operationPaths.forEach(({path, method}) => {
if (method) { |
<<<<<<<
"get": {
"operationId": "calendarsControllerGetAll",
"parameters": [],
"produces": [
"application/json"
],
"responses": {
=======
get: {
operationId: "CalendarsController.getAll",
responses: {... |
<<<<<<<
=======
class Test {
method(arg1: any, arg2: any) {}
}
class Parent {
id: string;
name: string;
categoryId: string;
}
class Children extends Parent {
id: string;
test: string;
categoryId: string;
}
class Children2 extends Parent {
id: string;
test: string;
categoryId: string;
}
>>>>>>... |
<<<<<<<
if (['sfdx-plugin', 'plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(`${rmrf} lib`, 'tsc -b', 'oclif-dev manifest', 'oclif-dev readme', 'npm shrinkwrap')
this.pjson.scripts.postpack = `${rmf} oclif.manifest.json npm-shrinkwrap.json`
=======
if (['plugin', ... |
<<<<<<<
const validLoaderOptions: ValidLoaderOptions[] = ['silent', 'logLevel', 'logInfoToStdOut', 'instance', 'compiler', 'contextAsConfigBasePath', 'configFile', 'transpileOnly', 'ignoreDiagnostics', 'errorFormatter', 'colors', 'compilerOptions', 'appendTsSuffixTo', 'appendTsxSuffixTo', 'entryFileCannotBeJs' /* DEPRE... |
<<<<<<<
if (['sfdx-plugin', 'plugin', 'multi'].includes(this.type)) {
this.pjson.scripts.prepack = nps.series(this.pjson.scripts.prepack, 'oclif-dev manifest', 'oclif-dev readme')
this.pjson.scripts.postpack = nps.series(this.pjson.scripts.postpack, 'rm -f .oclif.manifest.json')
=======
if (['plug... |
<<<<<<<
public async executeJavaScript<T>(scriptCode: string): Promise<T> {
=======
/**
* Always load the Fetch-polyfill on Android.
*
* Native 'Fetch API' on Android rejects all request for resources no HTTP or HTTPS.
* This breaks x-local requests (and file://).
*/
public ensure... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.