conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import {CannotCreateEntityIdMapError} from "../error/CannotCreateEntityIdMapError";
=======
import {PostgresConnectionOptions} from "../driver/postgres/PostgresConnectionOptions";
import {SqlServerConnectionOptions} from "../driver/sqlserver/SqlServerConnectionOptions";
>>>>>>>
import {PostgresConnectionOpti... |
<<<<<<<
import {EntityManager} from "../../entity-manager/EntityManager";
import {Broadcaster} from "../../subscriber/Broadcaster";
=======
import {InsertResult} from "../InsertResult";
import {TableIndexOptions} from "../../schema-builder/options/TableIndexOptions";
import {TableUnique} from "../../schema-builder/ta... |
<<<<<<<
const metadataPrimaryColumns = metadata.columns.filter(column => column.isPrimary && !column.isGenerated);
const addedPrimaryColumns = metadataPrimaryColumns.filter(metadataPrimaryColumn => {
return !!table.primaryKeyWithoutGenerated && !table.primaryKeyWithoutGenerated.c... |
<<<<<<<
import {Broadcaster} from "../subscriber/Broadcaster";
=======
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
>>>>>>>
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
import... |
<<<<<<<
async function getChangedFiles(token: string): Promise<File[] | null> {
if (github.context.eventName === 'pull_request') {
=======
async function getChangedFiles(token: string): Promise<string[] | null> {
if (github.context.eventName === 'pull_request' || github.context.eventName === 'pull_request_target'... |
<<<<<<<
await queryRunner.createTable(new Table("migrations", [
new TableColumn({
name: "timestamp",
type: this.connection.driver.normalizeType({ type: this.connection.driver.mappedDataTypes.migrationTimestamp }),
isPrimary: true,
... |
<<<<<<<
import {UniqueMetadata} from "./UniqueMetadata";
=======
import {PostgresConnectionOptions} from "../driver/postgres/PostgresConnectionOptions";
import {SqlServerConnectionOptions} from "../driver/sqlserver/SqlServerConnectionOptions";
import {CannotCreateEntityIdMapError} from "../error/CannotCreateEntityIdM... |
<<<<<<<
import {NativescriptConnectionOptions} from "../driver/nativescript/NativescriptConnectionOptions";
=======
import {ExpoConnectionOptions} from "../driver/expo/ExpoConnectionOptions";
>>>>>>>
import {NativescriptConnectionOptions} from "../driver/nativescript/NativescriptConnectionOptions";
import {ExpoConne... |
<<<<<<<
findByIds<Entity>(entityClass: ObjectType<Entity>|string, ids: any[], optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<Entity[]> {
=======
findByIds<Entity>(entityClass: ObjectType<Entity>|string, ids: any[], optionsOrConditions?: FindManyOptions<Entity>|Partial<Entity>): Pr... |
<<<<<<<
async log(): Promise<SqlInMemory> {
this.queryRunner = await this.connection.createQueryRunner("master");
=======
async log(): Promise<(string|{ up: string, down: string })[]> {
this.queryRunner = this.connection.createQueryRunner("master");
>>>>>>>
async log(): Promise<SqlInMemor... |
<<<<<<<
import {EntityManager} from "../../entity-manager/EntityManager";
=======
import {InsertResult} from "../InsertResult";
>>>>>>>
<<<<<<<
import {Broadcaster} from "../../subscriber/Broadcaster";
=======
import {OrmUtils} from "../../util/OrmUtils";
import {TableIndexOptions} from "../../schema-builder/opti... |
<<<<<<<
import {ColumnOptions} from "../decorator/options/ColumnOptions";
import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
import {LazyRelationsWrapper} from "../lazy-loading/LazyRelationsWrapper";
import {UniqueMetadata} from "../metadata/UniqueMetadata";
=======
>>>>>>>
import {UniqueMetadata} fr... |
<<<<<<<
async insert<Entity>(target: ObjectType<Entity>|string, entity: QueryPartialEntity<Entity>|(QueryPartialEntity<Entity>[]), options?: SaveOptions): Promise<InsertResult> {
// TODO: Oracle does not support multiple values. Need to create another nice solution.
if (this.connection.driver insta... |
<<<<<<<
count<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<number> {
=======
async count<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|Partial<Entity>): Promise<number> {
>>>>>>>
... |
<<<<<<<
const widgetMultiFilesDiv = document.evaluate('//div[contains(@class, "code-container")]/div[contains(@class, "Widget__MultiFiles")]', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
=======
const pageContentDiv = document.evaluate('//div[contains(@class, "PageContent-sc")]', document, ... |
<<<<<<<
export { DescriptionListItem } from './components/DescriptionList'
=======
export {
AccordionPanel,
AccordionPanelItem,
AccordionPanelContent,
AccordionPanelTrigger,
} from './components/AccordionPanel'
>>>>>>>
export { DescriptionListItem } from './components/DescriptionList'
export {
AccordionPan... |
<<<<<<<
export { BlankImage } from './components/Image'
=======
export { Heading } from './components/Heading'
export { HeadlineArea } from './components/HeadlineArea'
>>>>>>>
export { BlankImage } from './components/Image'
export { Heading } from './components/Heading'
export { HeadlineArea } from './components/Hea... |
<<<<<<<
import { CesiumExtender } from '../cesium-extender/extender';
import { AcHtmlDescComponent } from './components/ac-html-desc/ac-html-desc.component';
import { AcHtmlDirective } from './directives/ac-html/ac-html.directive';
import { AcHtmlContainerDirective } from './directives/ac-html-container/ac-html-contain... |
<<<<<<<
import { ArcDrawerService } from '../../services/arc-drawer/arc-drawer.service';
=======
import { PolygonDrawerService } from '../../services/polygon-drawer/polygon-drawer.service';
>>>>>>>
import { PolygonDrawerService } from '../../services/polygon-drawer/polygon-drawer.service';
import { ArcDrawerService ... |
<<<<<<<
import {AcMapLayerProviderComponent} from "./components/ac-map-layer-provider/ac-map-layer-provider.component";
=======
import {GeoUtilsService} from "./services/geo-utils/geo-utils.service";
>>>>>>>
import {AcMapLayerProviderComponent} from "./components/ac-map-layer-provider/ac-map-layer-provider.component... |
<<<<<<<
public Cesium = Cesium;
public editPoints$ = new Subject<AcNotification>();
public editPolylines$ = new Subject<AcNotification>();
public editPolygons$ = new Subject<AcNotification>();
public appearance = new Cesium.PerInstanceColorAppearance({flat : true});
public attributes = {color : Cesium.ColorGe... |
<<<<<<<
import { PolylinesEditorService } from './services/entity-editors/polyline-editor/polylines-editor.service';
import { PolylinesEditorComponent } from './components/polylines-editor/polylines-editor.component';
=======
import { CirclesEditorComponent } from './components/circles-editor/circles-editor.component... |
<<<<<<<
import { Component, OnInit, ViewChild, ChangeDetectorRef } from '@angular/core';
import { Observable } from 'rxjs';
import { AcNotification } from '../../angular-cesium/models/ac-notification';
import { ActionType } from '../../angular-cesium/models/action-type.enum';
import { MapEventsManagerService } from '..... |
<<<<<<<
import { PolylineEditorLayerComponent } from './components/editor-layer/polyline-example/polyline-editor-layer.component';
=======
import { PolygonsEditorLayerComponent } from './components/polygons-editor-layer/polygons-editor-layer.component';
import { CirclesEditorLayerComponent } from './components/circle... |
<<<<<<<
const mode3D = 3;
const mode2D = 2;
const modeColombus = 1;
=======
const defaultTilt = true;
>>>>>>>
const defaultTilt = true;
const mode3D = 3;
const mode2D = 2;
const modeColombus = 1;
<<<<<<<
maximumZoomDistance: defaultZooms
},
mode: mode3D
=======
maximumZoomDistance: def... |
<<<<<<<
export * from './components/polylines-editor/polylines-editor.component';
export * from './components/hippodrome-editor/hippodrome-editor.component';
=======
export * from './components/circles-editor/circles-editor.component';
export * from './components/polylines-editor/polylines-editor.component';
>>>>>>>... |
<<<<<<<
private arcGisMapServerProvider: MapLayerProviderOptions;
private position: any;
private positions: any;
private redMatirial: any;
private aquamarine: any;
private longitude: number;
private latitude: number;
@ViewChild(AcLabelDescComponent) label: AcLabelDescComponent;
@ViewChild(AcDynamicPolylineDes... |
<<<<<<<
export * from './models/editable-polyline';
=======
export * from './models/editable-circle';
>>>>>>>
export * from './models/editable-circle';
export * from './models/editable-polyline';
<<<<<<<
export * from './models/polygon-edit-options';
export * from './models/polyline-edit-options';
=======
export ... |
<<<<<<<
export * from './services/entity-editors/polygons-editor/polygons-editor.service';
export * from './services/entity-editors/polyline-editor/polylines-editor.service';
=======
export * from './services/entity-editors/polygons-editor/polygons-editor.service';
export * from './services/entity-editors/circles-edi... |
<<<<<<<
export class AcMapLayerProviderComponent implements OnInit {
private createWebMapServiceProvider(options) {
=======
export class AcMapLayerProviderComponent implements OnInit, OnChanges, OnDestroy {
private static createWebMapServiceProvider(options) {
>>>>>>>
export class AcMapLayerProviderComponent imple... |
<<<<<<<
init(mapContainer: HTMLElement) {
this.ngZone.runOutsideAngular(() => {
window['CESIUM_BASE_URL'] = './assets/Cesium';
this.cesiumViewer = new this.cesium.Viewer(mapContainer,
{
// Poor internet connection - use default globe image, TODO: should be removed
/... |
<<<<<<<
import { HippodromeEditorLayerComponent } from './components/editor-layer/hippodrome-example/hippodrome-editor-layer.component';
=======
import { HeatmapLayerComponent } from './components/heatmap-layer/heatmap-layer.component';
>>>>>>>
import { HeatmapLayerComponent } from './components/heatmap-layer/heatma... |
<<<<<<<
import { AcPolygonDescComponent } from './components/ac-polygon-desc/ac-polygon-desc.component';
=======
import { AcDefaultPlonterComponent } from './components/ac-default-plonter/ac-default-plonter.component';
>>>>>>>
import { AcPolygonDescComponent } from './components/ac-polygon-desc/ac-polygon-desc.compo... |
<<<<<<<
import { SelectionLayerComponent } from './components/selection-layer/selection-layer.component';
=======
import { ContextMenuComponent } from './components/context-menu/context-menu.component';
import { ContextMenuLayerComponent } from './components/context-menu-layer/context-menu-layer.component';
>>>>>>>
... |
<<<<<<<
import { PolygonsEditorLayerComponent } from './components/polygons-editor-layer/polygons-editor-layer.component';
import { CirclesEditorLayerComponent } from './components/circles-editor-layer/circles-editor-layer.component';
=======
import { EditorLayerComponent } from './components/editor-layer/editor-laye... |
<<<<<<<
import { PolygonPerformanceTestComponent } from './components/polygon-layer/polygon-performance-test/polygon-performance-test.component';
=======
import { KeyboardControlLayerComponent } from './components/keyboard-control-layer/keyboard-control-layer.component';
>>>>>>>
import { PolygonPerformanceTestCompon... |
<<<<<<<
import { AcStaticEllipseDescComponent } from './components/static-dynamic/ac-static-ellipse-desc/ac-static-ellipse-desc.component';
import { AcDynamicEllipseDescComponent } from './components/static-dynamic/ac-dynamic-ellipse-desc/ac-dynamic-ellipse-desc.component';
import { AcDynamicPolylineDescComponent } fro... |
<<<<<<<
import { AcArrayDescComponent } from './components/ac-array-desc/ac-array-desc';
=======
import { AcPointPrimitiveDescComponent } from './components/ac-point-primitive-desc/ac-point-primitive-desc.component';
>>>>>>>
import { AcArrayDescComponent } from './components/ac-array-desc/ac-array-desc';
import { Ac... |
<<<<<<<
private mapContainer: HTMLElement;
=======
@Input()
flyTo: any;
>>>>>>>
@Input()
flyTo: any;
private mapContainer: HTMLElement; |
<<<<<<<
import { EditorLayerComponent } from './components/editor-layer/editor-layer.component';
import { HtmlLayerComponent } from './components/html-layer/html-layer.component';
=======
import { SelectionLayerComponent } from './components/selection-layer/selection-layer.component';
import { ContextMenuComponent } ... |
<<<<<<<
import { Darknode, generateProposeMessage, generatePrevoteMessage, generatePrecommitMessage, generateSecretMessage } from "./Validate";
=======
import { Darknode, generatePrecommitMessage, generatePrevoteMessage, generateProposeMessage } from "./Validate";
>>>>>>>
import { Darknode, generatePrecommitMessage,... |
<<<<<<<
await updateCurrentFileIfPython(activeTextEditor);
=======
updateCurrentFileIfPython(vscode.window.activeTextEditor);
>>>>>>>
await updateCurrentFileIfPython(vscode.window.activeTextEditor); |
<<<<<<<
if (currentPanel) {
console.log("Sending clearing state command");
currentPanel.webview.postMessage({ command: "reset-state" });
}
=======
if (currentPanel) {
console.info("Sending clearing state command");
currentPanel.webview.postMessage({ comm... |
<<<<<<<
import { useMemo } from 'react';
import useOssFragment from './useOssFragment';
import { PaginationFunction } from './RelayHooksType';
=======
>>>>>>>
import { useMemo } from 'react'; |
<<<<<<<
deleteText?: string
buttonDeletePosition?: string,
buttonDeleteStyle?: object,
=======
deleteText?: string,
delayBeforeOnComplete?: number,
inputViewStyle?: ViewStyle,
keyboardViewStyle?: ViewStyle,
keyboardViewTextStyle?: TextStyle,
keyb... |
<<<<<<<
test(
'changes the href to another bundle if strategy moved it', async () => {
const bundler = new Bundler();
// This strategy moves a file to a different bundle.
const strategy = (bundles: Bundle[]): Bundle[] => {
return [
new Bundle(
... |
<<<<<<<
): Type<A & B> {
abstract class IntersectionClassType {
constructor() {
inheritPropertyInitializers(this, classARef);
inheritPropertyInitializers(this, classBRef);
}
}
=======
): MappedType<A & B> {
abstract class IntersectionClassType {}
>>>>>>>
): MappedType<A & B> {
abstract cl... |
<<<<<<<
export * from './sidebar';
export * from './contentTop';
=======
export * from './sidebar';
export * from './baPanel';
>>>>>>>
export * from './sidebar';
export * from './baPanel';
export * from './contentTop'; |
<<<<<<<
...ROUTER_PROVIDERS,
{provide: LocationStrategy, useClass: HashLocationStrategy}
=======
...APP_ROUTER_PROVIDERS,
{provide: LocationStrategy, useClass: HashLocationStrategy }
>>>>>>>
...APP_ROUTER_PROVIDERS,
{provide: LocationStrategy, useClass: HashLocationStrategy}
{provide: LocationStrategy,... |
<<<<<<<
): Type<Omit<T, typeof keys[number]>> {
=======
): MappedType<Omit<T, typeof keys[number]>> {
abstract class OmitClassType {}
>>>>>>>
): MappedType<Omit<T, typeof keys[number]>> { |
<<<<<<<
import {ROUTER_DIRECTIVES} from '@angular/router-deprecated';
// Angular 2 forms
import { REACTIVE_FORM_DIRECTIVES } from '@angular/forms';
=======
import {ROUTER_DIRECTIVES} from '@angular/router';
>>>>>>>
import {ROUTER_DIRECTIVES} from '@angular/router';
// Angular 2 forms
import { REACTIVE_FORM_DIRECTIVE... |
<<<<<<<
interactive?: boolean;
=======
userId: string;
>>>>>>>
userId: string;
interactive?: boolean;
<<<<<<<
pullPolicy,
interactive = false
=======
pullPolicy,
userId
>>>>>>>
pullPolicy,
userId,
interactive = false |
<<<<<<<
import { getUserId } from "magda-typescript-common/src/session/GetUserId";
import Registry from "magda-typescript-common/src/registry/AuthorizedRegistryClient";
import { AuthorizedRegistryOptions } from "magda-typescript-common/src/registry/AuthorizedRegistryClient";
=======
const { fileParser } = require("ex... |
<<<<<<<
import { Contact } from "Components/Editing/Editors/contactEditor";
import {
licenseLevel,
ContactPointDisplayOption
} from "constants/DatasetConstants";
=======
import { licenseLevel } from "constants/DatasetConstants";
>>>>>>>
import {
licenseLevel,
ContactPointDisplayOption
} from "constan... |
<<<<<<<
run((code: number) => {
Object.values(registry.records).forEach(
(record: any) => {
record.sourceTag = "stag";
if (record.aspects && record.aspects.source) {
... |
<<<<<<<
import AspectBuilder from "@magda/typescript-common/dist/AspectBuilder";
import Ckan from "./Ckan";
import createTransformer from "./createTransformer";
import JsonConnector from "@magda/typescript-common/dist/JsonConnector";
import Registry from "@magda/typescript-common/dist/registry/AuthorizedRegistryClient"... |
<<<<<<<
import Csw from "./Csw";
import JsonConnector from "@magda/typescript-common/dist/JsonConnector";
import Registry from "@magda/typescript-common/dist/registry/AuthorizedRegistryClient";
import createTransformer from "./createTransformer";
=======
import * as moment from "moment";
import * as URI from "urijs";... |
<<<<<<<
ckanExport?: CkanExportAspectType;
=======
access: Access;
>>>>>>>
ckanExport?: CkanExportAspectType;
access: Access;
<<<<<<<
const ckanExport: CkanExportAspectType = aspects["ckan-export"]
? aspects["ckan-export"]
: {
[config.defaultCkanServer]: {
... |
<<<<<<<
let temporalCoverage: TemporalCoverage | undefined;
let spatialCoverage: SpatialCoverage | undefined;
const rows = XLSX.utils.sheet_to_json(worksheet, { raw: false });
=======
const rows = XLSX.utils.sheet_to_json(worksheet, { raw: true });
>>>>>>>
let temporalCoverage... |
<<<<<<<
import Csw from './Csw';
import JsonConnector from '@magda/typescript-common/dist/JsonConnector';
import Registry from '@magda/typescript-common/dist/Registry';
import createTransformer from './createTransformer';
import datasetAspectBuilders from './datasetAspectBuilders';
import distributionAspectBuilders fro... |
<<<<<<<
export function ensureSchemaNotAlreadyDefined(schema : Schema | undefined | null, propertyKey : string | symbol) {
if (schema) {
throw new ConstraintDefinitionError(`A validation schema already exists for property: ${ String(propertyKey) }`);
}
}
function getDesignType(target : Object, targetKe... |
<<<<<<<
AnyConstraints,
ArrayConstraints,
BooleanConstraints,
DateConstraints,
FunctionConstraints,
JoiSchema,
NumberConstraints,
ObjectConstraints,
StringConstraints
=======
AnyConstraints,
ArrayConstraints,
BooleanConstraints,
DateConstraints,
FunctionConstraints,
NumberCon... |
<<<<<<<
import { _kendrite_workbench_hookInstantiationService } from 'vs/kendryte/vs/platform/vscode/electron-browser/createChannels.injection';
=======
import { MulitExtensionManagementService } from 'vs/platform/extensionManagement/node/multiExtensionManagement';
import { IRemoteAuthorityResolverService } from 'vs/... |
<<<<<<<
import { mnemonicMenuLabel as baseMnemonicLabel, unmnemonicLabel } from 'vs/base/common/labels';
=======
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { mnemonicMenuLabel as baseMnemonicLabel } from 'vs/base/common/labels';
>>>>>>>
import { mnemonicMenuLabel a... |
<<<<<<<
export function FuncSchema(schemaBuilder?: (schema: FunctionSchema) => FunctionSchema) : PropertyDecorator {
return typeConstraintDecorator([Function], (Joi) => {
let schema = Joi.func();
if (schemaBuilder) {
schema = schemaBuilder(schema);
}
return schema;
=====... |
<<<<<<<
Uri
} from "../../../src/constraints/string";
import * as Joi from "joi";
import {Validator} from "../../../src/Validator";
import { testConstraint, testConversion, testConstraintWithPojos } from '../testUtil';
=======
Uri,
} from '../../../src/constraints/string';
import * as Joi from 'joi';
import ... |
<<<<<<<
export function NumberSchema(schemaBuilder?: (schema: NumberSchema) => NumberSchema) : PropertyDecorator {
return typeConstraintDecorator([Number], (Joi) => {
let schema = Joi.number();
if (schemaBuilder) {
schema = schemaBuilder(schema);
}
return schema;
=======... |
<<<<<<<
import { _kendryte_main_hookInstantiationService } from 'vs/kendryte/vs/code/electron-main/createServices.injection';
=======
import { ISignService } from 'vs/platform/sign/common/sign';
import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnosticsService';
import { DiagnosticsService } from... |
<<<<<<<
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { CommandLineDialogService } from 'vs/platform/dialogs/node/dialogService';
import { ILabelService, LabelService } from 'vs/platform/label/common/label';
import { createWaitMarkerFile } from 'vs/code/node/wait';
import 'vs/kendryte/vs/c... |
<<<<<<<
import { ILabelService } from 'vs/platform/label/common/label';
import { _kendrite_workbench_hookInstantiationService } from 'vs/kendryte/vs/platform/vscode/electron-browser/createChannels';
=======
import { ILabelService, LabelService } from 'vs/platform/label/common/label';
import { IDownloadService } from ... |
<<<<<<<
import { nativeSep } from 'vs/base/common/paths';
import { _kendrite_main_hookInstantiationService } from 'vs/kendryte/vs/code/electron-main/createServices';
=======
import { nativeSep, join } from 'vs/base/common/paths';
import { homedir } from 'os';
import { localize } from 'vs/nls';
>>>>>>>
import { nativ... |
<<<<<<<
export * from './utils';
=======
export * from './helpers';
>>>>>>>
export * from './helpers';
export * from './utils';
<<<<<<<
export { Telegraf } from 'telegraf';
/**
* Backward compatibility with versions < 1.4.0,
* after removing TelegrafProvider service
* TODO: remove that on next major release
*/... |
<<<<<<<
import { Widget, BoxLayout } from "@phosphor/widgets";
=======
import {
Widget,
BoxLayout
} from '@phosphor/widgets';
>>>>>>>
import {
Widget,
BoxLayout
} from '@phosphor/widgets';
<<<<<<<
=======
import '../style/index.css';
import { JupyterLab } from '@jupyterlab/application';
>>>>>>>
impor... |
<<<<<<<
import { TYPE_YOUTUBE } from "..";
import { isEmpty, getYoutTubeVideoId } from "../utils";
=======
import { getVideoId } from '../utils';
import { TYPE_YOUTUBE } from '..';
import { isEmpty } from '../utils';
>>>>>>>
import { TYPE_YOUTUBE } from "..";
import { isEmpty, getYoutTubeVideoId } from "../utils";
i... |
<<<<<<<
path: 'book/search',
loadChildren: '../components/book/search-results/search-results.module#SearchResultsModule'
},
{
=======
path: 'book/donate/:id',
component: DonatePageComponent,
canActivate: [AuthGuardUser]
},
{
>>>>>>>
path: 'book/search',
loadChildren: '../component... |
<<<<<<<
import { ImageResult, ResizeOptions } from 'ng2-imageupload';
import { DomSanitizer } from '@angular/platform-browser';
=======
import { ImageResult } from 'ng2-imageupload';
import { Ng2ImgMaxService } from 'ng2-img-max';
>>>>>>>
import { ImageResult, ResizeOptions } from 'ng2-imageupload';
import { DomSan... |
<<<<<<<
path: 'book/list',
component: BookListComponent,
canActivate: [AuthGuard]
},
{
=======
path: 'quem-somos',
component: QuemSomosComponent
},
{
>>>>>>>
path: 'book/list',
component: BookListComponent,
canActivate: [AuthGuard]
},
{
path: 'quem-somos',
componen... |
<<<<<<<
fetchPairData,
=======
refreshSwap,
>>>>>>>
fetchPairData,
refreshSwap, |
<<<<<<<
if (!repeatSeason) {
await freeAgents.normalizeContractDemands({
type: "dummyExpiringContracts",
});
}
=======
// Handle jersey number conflicts, which should only exist for players added in free agency, because otherwise it would have been handled at the time of signing
const playersByTeam = grou... |
<<<<<<<
import {Analyzer} from '../analyzer';
import {Descriptor, DocumentDescriptor, ImportDescriptor} from '../ast/ast';
=======
import {Descriptor, ImportDescriptor, InlineDocumentDescriptor} from '../ast/ast';
import {HtmlEntityFinder} from './html-entity-finder';
>>>>>>>
import {Descriptor, ImportDescriptor, I... |
<<<<<<<
InOperatorInteraction,
Interactions,
=======
Interaction,
>>>>>>>
InOperatorInteraction,
Interaction, |
<<<<<<<
// reset
// TODO(dz) this should really be a class with proper constructor
nextFnNum = 0
let outLns = file.getChildren()
.map(emitNode)
.reduce((p, c) => p.concat(c), [])
let output = outLns.join("\n");
result.outfiles[file.fileName.repl... |
<<<<<<<
import { ACTION_TYPES as CONNECTION_ACTION_TYPES, DisconnectAction } from '../../connectionActions'
import { RegionSettings, Trades } from '../../types'
=======
import { Action } from 'redux'
import { DISCONNECT_SERVICES } from '../../connectionActions'
import { Trades } from '../../types'
>>>>>>>
import { A... |
<<<<<<<
export const PRICE_STALE_AFTER_X_IN_MS = 6000
export interface Rate {
bigFigure: number
rawRate: number
ratePrecision: number
pipFraction: number
pipPrecision: number
pips: number
}
export enum Direction {
Sell = 'Sell',
Buy = 'Buy',
}
export enum PriceMovementTypes {
Up = 'Up',
Down = 'D... |
<<<<<<<
import { ACTION_TYPES as CONNECTION_ACTION_TYPES, DisconnectAction } from '../connectionStatus'
import { buildNotification } from '../notification/notificationUtils'
=======
>>>>>>>
import { ACTION_TYPES as CONNECTION_ACTION_TYPES, DisconnectAction } from '../connectionStatus' |
<<<<<<<
import { fromEventPattern } from 'rxjs'
=======
import { excelAdapter } from './excel'
>>>>>>>
import { fromEventPattern } from 'rxjs'
import { excelAdapter } from './excel' |
<<<<<<<
export const spotTileEpicsCreator = combineEpics(executeTradeEpic, onTradeExecuted)
=======
export const spotTileEpic = combineEpics(executeTradeEpic, displayCurrencyChart, onTradeExecuted)
>>>>>>>
export const spotTileEpic = combineEpics(executeTradeEpic, onTradeExecuted) |
<<<<<<<
import { Browser, Finsemble, OpenFin, PlatformAdapter, Symphony, Glue42 } from './'
=======
import { Browser, Finsemble, OpenFin, Symphony } from './'
>>>>>>>
import { Browser, Finsemble, OpenFin, Symphony, Glue42 } from './'
<<<<<<<
const getPlatform: () => PlatformAdapter = () => {
=======
export const ... |
<<<<<<<
function createShadowValue(name: string, type: string, v?: string, shadowType?: string): Element {
=======
function createShadowValue(name: string, type: string, v?: string): Element {
if (v && v.slice(0, 1) == "\"")
v = JSON.parse(v);
>>>>>>>
function createShadowValue(name: string, type: string... |
<<<<<<<
import rootReducer, { GlobalState } from './combineReducers'
=======
import rootReducer from './combineReducers'
import { compositeStatusServiceEpic } from './shell/compositeStatus'
import { connectionStatusEpic } from './shell/connectionStatus'
import { linkEpic } from './shell/epics'
import { openfinEpic } ... |
<<<<<<<
} else if (parsed.flags["just"]) {
=======
}
if (hasArg("just")) {
>>>>>>>
}
if (parsed.flags["just"]) {
<<<<<<<
} else if (parsed.flags["sourceMaps"]) {
=======
}
if (hasArg("include-source-maps")) {
>>>>>>>
}
if (parsed.flags["sourceMaps"]) {
<<<<<<<
... |
<<<<<<<
=======
if (!this.isPresent) {
return
}
>>>>>>>
<<<<<<<
publishCurrentPositions(ccyPairPositions: any) {
=======
publishCurrentPositions(ccyPairPositions) {
if (!this.isPresent) {
return
}
>>>>>>>
publishCurrentPositions(ccyPairPositions: any) {
if (!this.isPresent)... |
<<<<<<<
};
const actual = parentMsg.toObject() as mapType;
const expected: mapType = {
externalEnumsMap: [],
externalChildrenMap: [],
=======
}, {
externalEnumsMap: [] as Array<[number, ExternalEnum]>,
externalChildrenMap: [] as Array<[string, {
myStri... |
<<<<<<<
import { Bidi} from "./formatting/bidi"
import { Hyperlink } from "./links";
=======
import { Bookmark, Hyperlink } from "./links";
>>>>>>>
import { Bidi} from "./formatting/bidi"
import { Bookmark, Hyperlink } from "./links"; |
<<<<<<<
import { Border, ThematicBreak } from "./formatting/border";
import { Indent } from "./formatting/indent";
=======
import { ThematicBreak } from "./formatting/border";
import { IIndentAttributesProperties, Indent } from "./formatting/indent";
>>>>>>>
import { Border, ThematicBreak } from "./formatting/border... |
<<<<<<<
import { FooterReferenceType, HeaderReference, HeaderReferenceType } from "./document/body/section-properties";
import { SectionPropertiesOptions } from "./document/body/section-properties/section-properties";
=======
>>>>>>>
import { FooterReferenceType, HeaderReference, HeaderReferenceType } from "./docume... |
<<<<<<<
const newJson = Utility.jsonify(thematicBreak);
const attributes = {
color: "auto",
space: 1,
val: "single",
sz: 6,
};
assert.equal(JSON.stringify(newJson.root[0].root[0].root), JSON.stringify(attribu... |
<<<<<<<
import { IPageSizeAttributes } from "./page-size/page-size-attributes";
import { TitlePage } from "./title-page/title-page";
=======
import { IPageSizeAttributes, PageOrientation } from "./page-size/page-size-attributes";
import { FooterReferenceType, IPageNumberTypeAttributes, PageNumberType, PageNumberForma... |
<<<<<<<
import { FootNotes } from "./footnotes";
import { FirstPageHeaderWrapper, HeaderWrapper } from "./header-wrapper";
=======
import { HeaderWrapper } from "./header-wrapper";
>>>>>>>
import { FootNotes } from "./footnotes";
import { HeaderWrapper } from "./header-wrapper";
<<<<<<<
private readonly headerW... |
<<<<<<<
const run = new Run({
bold: true,
});
const newJson = Utility.jsonify(run);
assert.equal(newJson.root[0].root[0].rootKey, "w:b");
assert.equal(newJson.root[0].root[1].rootKey, "w:bCs");
=======
run.bold();
cons... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.