conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
public error = undefined
@ViewChild(MatPaginator) paginator: MatPaginator
=======
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator
>>>>>>>
public error = undefined
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator |
<<<<<<<
import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { SidenavComponent } from './sidenav/sidenav.component'
=======
import { MatButtonToggleModule } from '@angular/material/button-toggle'
import { LayoutModule } from '@angular/cdk/layout'
import { MatGridListModule } from '@angular... |
<<<<<<<
import { AddressCreateComponent } from './address-create/address-create.component'
import { AddressSelectComponent } from './address-select/address-select.component'
=======
import { PaymentService } from './Services/payment.service'
import { PaymentComponent } from './payment/payment.component'
import { Paym... |
<<<<<<<
import { OrderSummaryComponent } from './order-summary/order-summary.component'
import { PurchaseBasketComponent } from './purchase-basket/purchase-basket.component'
=======
import { AddressComponent } from './address/address.component'
import { SavedAddressComponent } from './saved-address/saved-address.comp... |
<<<<<<<
fixture: '#navbarLoginButton',
position: 'right'
=======
fixture: {
type: 'id',
value: 'navbarLoginButton'
},
position: 'right',
async resolved() {
while (true) {
console.log(window.location.hash)
... |
<<<<<<<
import { PaymentComponent } from './payment/payment.component'
import { SavedPaymentMethodsComponent } from './saved-payment-methods/saved-payment-methods.component'
=======
import { AccountingComponent } from './accounting/accounting.component'
import { roles } from './roles'
>>>>>>>
import { PaymentCompone... |
<<<<<<<
import { OrderHistoryComponent } from './order-history/order-history.component'
=======
import { DeliveryMethodComponent } from './delivery-method/delivery-method.component'
>>>>>>>
import { OrderHistoryComponent } from './order-history/order-history.component'
import { DeliveryMethodComponent } from './deli... |
<<<<<<<
AddressCreateComponent,
AddressListComponent,
AccountingComponent
=======
AccountingComponent,
PrivacyPolicyComponent,
ChallengeStatusBadgeComponent
>>>>>>>
AddressCreateComponent,
AddressListComponent,
AccountingComponent,
PrivacyPolicyComponent,
ChallengeStatusBa... |
<<<<<<<
import EventStatus from "schema/input_fields/event_status"
import PartnerShowSorts from "schema/sorts/partner_show_sorts"
=======
import cityData from "../city/cityDataSortedByDisplayPreference.json"
import { LOCAL_DISCOVERY_RADIUS_KM } from "../city/constants"
const location_by_city_slug = cityData.reduce((... |
<<<<<<<
import { QueryDescription } from "../query-builder.ts";
import { Values } from '../data-types.ts';
import { DatabaseDialect } from "../database.ts";
=======
import type { QueryDescription } from "../query-builder.ts";
import type { Values } from "../data-types.ts";
>>>>>>>
import type { QueryDescription } fr... |
<<<<<<<
data: EventDetail | any;
}
export interface AccountState {
// Account 상태가 False일 경우, 모든 항목이 null임, 만약 true일 경우 모든 항목이 다 있어야함.
// 만약 회원가입을 하지 않아서 값이 넘어오질 않으면, 이 State를 업데이트하지 않음.
isLogin: boolean;
userId: number;
googleId: number;
email: string;
firstName?: string;
lastName?: string;
phoneNu... |
<<<<<<<
router.get('/coordinate', controllers.convertPlaceToCoordinate);
router.get('/:eventId', paramsValidator('eventId'), controllers.getEvent);
router.get(
'/:eventId/tickets',
paramsValidator('eventId'),
controllers.getEventTickets,
);
=======
router.get('/:eventId', controllers.getEvent);
router.get('/:ev... |
<<<<<<<
export const MY_CREATED_EVENTS = '나의 주최한 이벤트';
export const EVENT_FORM_FORM_IS_PUBLIC = '공개 여부';
export const EVENT_FORM_FORM_IS_PUBLIC_LABEL =
'이벤트를 공개하지 않으면 링크로는 이벤트를 접속할 수 있지만 BookUs의 메인 페이지에는 나타나지 않습니다. 아직 공개할 준비가 안 되어 있거나, 메인에 공개하고 싶지 않으면 체크를 해제 하세요.';
export const EVENT_FORM_TITLE = '이벤트 제목';
export co... |
<<<<<<<
export { default as LNBItem } from './atoms/LNBItem';
=======
export { default as TuiEditor } from './atoms/TuiEditor';
export { default as TuiViewer } from './atoms/TuiViewer';
>>>>>>>
export { default as LNBItem } from './atoms/LNBItem';
export { default as TuiEditor } from './atoms/TuiEditor';
export { de... |
<<<<<<<
export const HISTORY_METHOD_REPLACE = 'REPLACE';
export const REFUND_TICKET_SUCCESS = '환불이 완료되었습니다.';
export const REFUND_TICKET_FAILURE = '환불이 실패했습니다.';
export const NOT_FOUND_BOUGHT_TICKET = '아직 구매한 티켓이 없네요..😅';
export const NOT_FOUND_CREATED_EVENT = '주최한 이벤트가 없네요..🤣';
=======
export const HISTORY_METHOD... |
<<<<<<<
export const ONLY_IMG_FILE_INFO = '이미지 파일만 업로드 가능합니다.';
export const IMG_UPLOAD_INFO = '16:9 비율의 이미지가 가장 잘 어울립니다.';
export const FILE_NOT_FOUND_ERROR_INFO = '파일을 찾을 수 없습니다.';
=======
export const ONLY_IMAGE_FILE_INFO = '이미지 파일만 업로드 가능합니다.';
export const IMAGE_UPLOAD_INFO = '16:9 비율의 이미지가 가장 잘 어울립니다.';
export ... |
<<<<<<<
<translation>Banir nome de &utilizador</translation>
=======
<translation>banir &nome de utilizador</translation>
>>>>>>>
<translation>Banir nome de &utilizador</translation>
<<<<<<<
<translation>Banir endereço de &IP</translation>
=======
<translati... |
<<<<<<<
import { suite as SelectTests } from './tests/select.test';
import { suite as ShouldAddTest } from './tests/shouldAdd.test';
import { suite as StringValidatorTests } from './tests/stringValidator.test';
=======
import { typeguards as TypeguardsTest } from './tests/typeguards.test';
>>>>>>>
import { suite as... |
<<<<<<<
import { Engine } from "../../ecs/classes/Engine";
=======
import _ from "lodash";
import { AssetLoaderState } from "../../assets/components/AssetLoaderState";
import { LifecycleValue } from "../../common/enums/LifecycleValue";
import { isClient } from "../../common/functions/isClient";
import { DomEventBehav... |
<<<<<<<
import { Prefab } from "@xr3ngine/engine/src/common/interfaces/Prefab";
=======
>>>>>>>
import { FollowCameraComponent } from "@xr3ngine/engine/src/camera/components/FollowCameraComponent";
import { Prefab } from "@xr3ngine/engine/src/common/interfaces/Prefab";
<<<<<<<
=======
import { TransformComponent ... |
<<<<<<<
app.configure(instances)
app.configure(email);
app.configure(authManagement);
=======
app.configure(xrAvatars)
app.configure(xrLocations)
app.configure(xrObjects)
app.configure(xrLocationInstances)
app.configure(xrScenes)
>>>>>>>
app.configure(email);
app.configure(authManagement);
app.... |
<<<<<<<
function getCredentials(projectDir: string, credentialsPath: string) {
const projectConfig = require(path.resolve(projectDir, "dataform.json"));
return utils.readCredentials(projectConfig.warehouse, credentialsPath);
}
function assertPathExists(checkPath: string) {
if (!fs.existsSync(checkPath)) {
th... |
<<<<<<<
=======
case 'poly': {
const googlePolyMediaInsance = new GooglePolyMedia();
result = await googlePolyMediaInsance.searchGooglePolyMedia(params?.query);
break;
}
case 'asset': {
//TODO Do some stuff here to get user's assets
result = [];
break;... |
<<<<<<<
import { addComponent } from '../../ecs/functions/EntityFunctions';
import { ColliderComponent } from '../components/ColliderComponent';
=======
import { addComponent, removeComponent } from '../../ecs/functions/EntityFunctions';
import { TransformComponent } from "@xr3ngine/engine/src/transform/components/Tr... |
<<<<<<<
=======
import { Interactable } from "../../../interaction/components/Interactable";
import { onInteraction, onInteractionHover } from "../../interactive/functions/commonInteractive";
>>>>>>>
import { Interactable } from "../../../interaction/components/Interactable";
import { onInteraction, onInteractionHov... |
<<<<<<<
interface AgentOptions {
[key: string]: string;
}
interface Options {
jwksUri: string;
rateLimit?: boolean;
cache?: boolean;
cacheMaxEntries?: number;
cacheMaxAge?: number;
jwksRequestsPerMinute?: number;
strictSsl?: boolean;
requestHeaders?: He... |
<<<<<<<
var utf8 = options.utf8;
if (utf8) {
request.setUtf8Charset();
}
request.setNotificationConfig(new (<any>net).gotev.uploadservice.UploadNotificationConfig());
=======
var displayNotificationProgress = typeof options.androidDisplayNotificationProgress === "... |
<<<<<<<
this.onResize = this.onResize.bind(this);
=======
console.log("child appended")
console.log('resize binded')
>>>>>>>
<<<<<<<
this.queryResults.renderers.removed?.forEach((entity: Entity) => {
=======
if(this.isInitialized)
this.queryResults.renderers.all.forEach((entity: Entity... |
<<<<<<<
import TransformParent from "./transform/components/TransformParent"
import NetworkObject from "./networking/defaults/components/NetworkObject"
=======
>>>>>>>
import TransformParent from "./transform/components/TransformParent"
import NetworkObject from "./networking/defaults/components/NetworkObject"
<<... |
<<<<<<<
export async function createCamVideoProducer(channelType: string, channelId?: string): Promise<void> {
if (MediaStreamSystem.instance.mediaStream !== null && networkTransport.videoEnabled === true) {
const transport = channelType === 'instance' ? networkTransport.instanceSendTransport : networkTrans... |
<<<<<<<
=======
if(worldState.transforms === undefined || worldState.transforms.length < 1)
return;// console.warn("Worldstate transforms is null");
>>>>>>>
if(worldState.transforms === undefined || worldState.transforms.length < 1)
return;// console.warn("Worldstate transforms is null"); |
<<<<<<<
if (query.reactive && query.components.indexOf(Component) !== -1) {
query.eventDispatcher.dispatchEvent(Query.prototype.COMPONENT_CHANGED, entity, component)
=======
if (query.reactive && query.Components.indexOf(Component) !== -1) {
query.eventDispatcher.dispatchEvent(QUERY_COMPONENT_CHAN... |
<<<<<<<
import * as THREE from "three"
=======
import { default as vec2, default as vec3, vec4, mat3, mat4 } from 'gl-matrix';
>>>>>>>
import * as THREE from "three"
import { default as vec2, default as vec3, vec4, mat3, mat4 } from 'gl-matrix';
<<<<<<<
export type Vector2 = THREE.Vector2 | [number, number]
export ... |
<<<<<<<
import * as authentication from '@feathersjs/authentication'
const { authenticate } = authentication.hooks
=======
import collectAnalytics from '../../hooks/collect-analytics'
>>>>>>>
import collectAnalytics from '../../hooks/collect-analytics'
import * as authentication from '@feathersjs/authentication'
c... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
function handleAfterLoginRedirect(authUser, redirectTo?) {
const accessToken = authUser.accessToken
const params = new URLSearchParams(document.location.search)
redirectTo = params.get('redirectTo') || '/'
if (params.get('redirectTo')) {
redirectTo = params.get('redir... |
<<<<<<<
import feedFiresReducer from './feedFires/reducers';
=======
import mediastreamReducer from './mediastream/reducers';
>>>>>>>
import feedFiresReducer from './feedFires/reducers';
import mediastreamReducer from './mediastream/reducers';
<<<<<<<
feeds: feedReducer,
feedFires: feedFiresReducer
=======
... |
<<<<<<<
import { MeshPhysicalMaterial, TorusGeometry } from "three";
=======
import { ProcessModelAsset } from "../functions/ProcessModelAsset";
>>>>>>>
import { MeshPhysicalMaterial, TorusGeometry } from "three";
import { ProcessModelAsset } from "../functions/ProcessModelAsset";
<<<<<<<
execute () {
if(this... |
<<<<<<<
const name = component.name.replace(/-\d+/, "").replace(" ", "")
// Override for loading mesh colliders
if (SceneObjectLoadingSchema[name] === undefined)return console.warn("Couldn't load ", name);
const componentSchema = SceneObjectLoadingSchema[name];
=======
let name = component.name.replace(/-... |
<<<<<<<
},
[DefaultInput.RIGHT]: {
=======
},
[BinaryValue.OFF]: [
{
behavior: driveSteering,
args: {
direction: 0
}
}
]
},
// [DefaultInput.JUMP]: {
// [BinaryValue.ON]: {
// started: [
// {
// ... |
<<<<<<<
static vehicles: any;
static physicsFrameRate: number;
=======
static reset():void {
// delete all entities
// TODO: force components deletion and systems processing of their deletion?
// TODO: cleanup
this.nextEntityId = 0
// cleanup/unregister components
// TODO: cleanup
... |
<<<<<<<
import uploads from './uploads/uploads.service';
=======
import email from './email/email.service'
import authManagement from './auth-management/auth-management.service'
>>>>>>>
import uploads from './uploads/uploads.service';
import email from './email/email.service'
import authManagement from './auth-ma... |
<<<<<<<
export { testBlockLocalhost, testBlockNonLocalhost, testWhiteListLocalhost, testRestrictLocalhost } from './lib/rate-limiter-blackwhite-test';
export { testExecEvenly, testNonExecEvenly } from './lib/rate-limiter-exec-evenly-test';
=======
export { testBlockLocalhost, testBlockNonLocalhost, testWhiteListLocal... |
<<<<<<<
import GraphQL from './graphql/graphql.service'
=======
import identityProvider from './identity-provider/identity-provider.service'
>>>>>>>
import GraphQL from './graphql/graphql.service'
import identityProvider from './identity-provider/identity-provider.service'
<<<<<<<
app.configure(GraphQL)
=======
... |
<<<<<<<
=======
const { schema, agonesSDK } = attributes
>>>>>>>
<<<<<<<
// Initialize the server automatically
if (process.env.SERVER_MODE != undefined && process.env.SERVER_MODE !== 'client')
Network.instance.transport.initialize();
// TODO: Move network timestep (30) to config
this.fi... |
<<<<<<<
testRestrictLocalhost,
testExecEvenly,
testNonExecEvenly
} from '@examples/rate-limiter-points-test';
=======
testRestrictLocalhost,
testGlobalKeyprefix,
testUniqueKeyprefix } from '@examples/rate-limiter-points-test';
>>>>>>>
testRestrictLocalhost,
testExecEvenly,
testNo... |
<<<<<<<
const q = new Quaternion();
const direction = new Vector3();
=======
const q: Vector4 = [0, 0, 0, 0];
const direction: Vector3 = [0, 0, 0];
const maxAngleX = 35.0472
const maxAngleY = 35.0472
>>>>>>>
const q = new Quaternion();
const direction = new Vector3();
const maxAngleX = 35.0472
const maxAngleY = 3... |
<<<<<<<
const instance = sequelizeClient.define('instance', {
url: {
=======
const Instance = sequelizeClient.define('instance', {
id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV1,
allowNull: false,
primaryKey: true
},
address: {
>>>>>>>
const instance = sequel... |
<<<<<<<
async sendEmail(toEmail: string, token: string): Promise<void> {
const hashLink = getLink('login', token)
=======
async update (id: NullableId, data: Data, params?: Params): Promise<Data> {
return data
}
async patch (id: NullableId, data: Data, params?: Params): Promise<Data> {
return dat... |
<<<<<<<
const isObject3d =(args.obj3d.type !== undefined)
=======
console.log("Adding object 3d")
console.log(args)
const isObject3d =(typeof args.obj3d === 'object')
>>>>>>>
const isObject3d =(typeof args.obj3d === 'object') |
<<<<<<<
const existingTransports = Network.instance.transports.filter(t => t.appData.peerId === peerId && t.appData.direction === direction && t.appData.partyId === partyId);
=======
const existingTransports = MediaStreamComponent.instance.transports.filter(t => t.appData.peerId === peerId && t.appData.direc... |
<<<<<<<
import { jumpStart } from "./behaviors/jumpStart";
import { move } from './behaviors/move';
import { rotateAround } from './behaviors/rotate';
import { cameraPointerLock } from "@xr3ngine/engine/src/camera/behaviors/cameraPointerLock";
import { getInCar } from '@xr3ngine/engine/src/physics/behaviors/getInCarBeh... |
<<<<<<<
=======
console.log("Joined world");
// return Promise.resolve();
this.socket.emit(MessageTypes.Heartbeat.toString(), 1000);
>>>>>>>
console.log("Joined world");
// return Promise.resolve(); |
<<<<<<<
addState(entity, { state: CharacterStateTypes.WALK_START_BACKWARD })
=======
addState(entity, { state: CharacterStateTypes.WALK_START_BACK_RIGHT });
>>>>>>>
addState(entity, { state: CharacterStateTypes.WALK_START_BACKWARD }); |
<<<<<<<
/** Time of the snapshot. */
snapShotTime: BigInt
=======
snapShotTime: number
>>>>>>>
/** Time of the snapshot. */
snapShotTime: number
<<<<<<<
/** Time of the snapshot. */
snapShotTime: BigInt,
=======
snapShotTime: number,
>>>>>>>
/** Time of the snapshot. */
snapShotTime: number,
... |
<<<<<<<
didCreateMagicLink,
updateSettings
=======
didCreateMagicLink,
loadedUserData
>>>>>>>
didCreateMagicLink,
updateSettings,
loadedUserData
<<<<<<<
import { axiosRequest,apiUrl } from '../service.common'
=======
import { resolveUser } from "interfaces/User"
import { resolveAuthUser } from "int... |
<<<<<<<
import identityProviderType from './identity-provider-type/identity-provider-type.service';
import userSettings from './user-settings/user-settings.service';
=======
import SceneListing from './scene-listing/scene-listing.service'
import UploadMedia from './upload-media/upload-media.service'
>>>>>>>
import... |
<<<<<<<
import ActionsRenderer = require('vs/base/parts/tree/browser/actionsRenderer');
import Actions = require('vs/base/common/actions');
import {compareAnything} from 'vs/base/common/comparers';
import ActionBar = require('vs/base/browser/ui/actionbar/actionbar');
import TreeDefaults = require('vs/base/parts/tree/br... |
<<<<<<<
terminal: {
external: {
linuxExec: string,
windowsExec: string
}
=======
externalTerminal: {
linuxExec: string,
macExec: string,
windowsExec: string
>>>>>>>
terminal: {
external: {
linuxExec: string,
macExec: string,
windowsExec: string
} |
<<<<<<<
private listenerToUnbind: ListenerUnbind[];
=======
private listenerToUnbind: IDisposable[];
private _workingFilesModel: WorkingFilesModel;
>>>>>>>
private listenerToUnbind: IDisposable[]; |
<<<<<<<
this.extensionHostProcessReady = false;
=======
lifecycleService.addBeforeShutdownParticipant(this);
>>>>>>>
this.extensionHostProcessReady = false;
lifecycleService.addBeforeShutdownParticipant(this); |
<<<<<<<
export class WorkbenchStageAction extends BaseStageAction {
static ID = 'workbench.action.git.stage';
static LABEL = nls.localize('workbenchStage', "Stage");
private contextService: IWorkspaceContextService;
constructor(
id = WorkbenchStageAction.ID,
label = WorkbenchStageAction.LABEL,
@IGitService ... |
<<<<<<<
nls.localize('debugConsole', "DEBUG CONSOLE"),
'repl'
=======
nls.localize('debugConsole', "Debug Console"),
'repl',
40
>>>>>>>
nls.localize('debugConsole', "Debug Console"),
'repl' |
<<<<<<<
}
export function range(to: number, from = 0): number[] {
const result = [];
for (let i = from; i < to; i++) {
result.push(i);
}
return result;
=======
}
export function fill<T>(num: number, valueFn: () => T, arr: T[] = []): T[] {
for (let i = 0; i < num; i++) {
arr[i] = valueFn();
}
return ar... |
<<<<<<<
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
import {IScrollable, DelegateScrollable} from 'vs/base/common/scrollable';
=======
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {IScrollable} from 'vs/base/common/scrollable';
>>>>>>>
import {IDisposable, dispose} from... |
<<<<<<<
if (event.path)
VScroller.current = (event.path as EventTarget[])[0] as Element;
=======
VScroller.current = (event.path as EventPath)[0] as Element;
>>>>>>>
if (event.path)
VScroller.current = (event.path as EventPath)[0] as Element; |
<<<<<<<
return (path.charCodeAt(0) === 47 ? origin : path.startsWith(prefix) ? "" : prefix) + path;
=======
return (path.charCodeAt(0) === KnownKey.slash ? origin : prefix) + path;
>>>>>>>
return (path.charCodeAt(0) === KnownKey.slash ? origin : path.startsWith(prefix) ? "" : prefix) + path; |
<<<<<<<
if (typeof browser !== "undefined" && browser.runtime) {
const i = innerCSS.indexOf(":host"), cls = "vimium-ui-" + ((8 + Math.random()) * 100 | 0),
outerCSS = innerCSS.substring(i + 5, innerCSS.indexOf("}", i) + 1);
(this.box as HTMLElement).className = cls;
(this.box as HT... |
<<<<<<<
import {ValueNameChangedEvent} from '../../meter/value-name-changed-event';
=======
import {MeterReadNameChangedEvent} from '../../meter/meter-read-name-changed-event';
import {ValueType} from './value-type';
import {ReadRegisterType} from './read-register-type';
>>>>>>>
import {ValueNameChangedEvent} from '... |
<<<<<<<
it('endsWith', () => {
const endsWith = FR.endsWith(fromEquals(JSONEqual));
fc.assert(
fc.property(
fc.array(fc.anything()),
fc.array(fc.anything()),
(suffix, as) =>
R.endsWith(suffix, as) === endsWith(suffix, as) && R.endsWith(suffix)(as) === endsWith(suffix)(... |
<<<<<<<
export * from './takeLast';
export * from './endsWith';
=======
export * from './takeLast';
export * from './clamp';
>>>>>>>
export * from './takeLast';
export * from './endsWith';
export * from './clamp'; |
<<<<<<<
import { FoalModule, log, rest, view } from '@foal/core';
=======
import { afterThatLog, FoalModule, log, rest } from '@foal/core';
>>>>>>>
import { afterThatLog, FoalModule, log, rest, view } from '@foal/core'; |
<<<<<<<
=======
import memorize from 'memorize-decorator';
import { isArray } from 'util';
import { ProjectSource, SourceLike, SourceType } from './source';
>>>>>>> |
<<<<<<<
this.autoExtendDescriptions();
=======
this.i18n = new ModelI18n(input.i18n || [], this);
>>>>>>>
this.autoExtendDescriptions();
this.i18n = new ModelI18n(input.i18n || [], this); |
<<<<<<<
ADD_CHILD_ENTITIES_FIELD_PREFIX,
CREATE_ENTITY_FIELD_PREFIX,
DELETE_ENTITY_FIELD_PREFIX,
ENTITY_CREATED_AT,
ENTITY_UPDATED_AT,
ID_FIELD,
=======
ADD_CHILD_ENTITIES_FIELD_PREFIX, CALC_MUTATIONS_OPERATORS,
CREATE_ENTITY_FIELD_PREFIX, DELETE_ENTITY_FIELD_PREFIX, ENTITY_CREATED_AT,... |
<<<<<<<
const noImplicitAny = collectNoImplicitAny(argv, compilerOptions, rawOptions);
const noImplicitThis = collectNoImplicitThis(argv, compilerOptions, rawOptions);
const { compilerStrictNullChecks, typeStrictNullChecks } = collectStrictNullChecks(argv, compilerOptions, rawOptionTypes);
=======
con... |
<<<<<<<
testEnv
.validateSpec('gitignore', '.gitignore')
.validateSpec('ormconfig.js')
.validateSpec('package.json')
.validateSpec('tsconfig.json')
.validateSpec('tsconfig.app.json')
.validateSpec('tsconfig.e2e.json')
.validateSpec('tsconfig.json')
.validateSpec('tsco... |
<<<<<<<
// let faceCount = 1;
=======
if (light.gameObject.scene !== activeScene) {
continue;;
}
let faceCount = 1;
>>>>>>>
// if (light.gameObject.scene !== activeScene) {
// continue;;
/... |
<<<<<<<
declare var BASE_URL: string;
declare var RUN_DEMO: boolean;
declare var TARGET_DESKTOP_BUILD: boolean;
declare var TARGET_DESKTOP: boolean;
=======
>>>>>>>
declare var BASE_URL: string;
declare var RUN_DEMO: boolean;
declare var TARGET_DESKTOP_BUILD: boolean;
declare var TARGET_DESKTOP: boolean; |
<<<<<<<
import { AboutModule } from './+about/about.module';
import { HomeModule } from './+home/home.module';
import { ChartsModule } from './+charts/charts.module';
=======
import { AboutModule } from './about/about.module';
import { HomeModule } from './home/home.module';
>>>>>>>
import { AboutModule } from './ab... |
<<<<<<<
=======
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler
>>>>>>>
import { enableProdMode } from '@angular/core';
// The browser platform with a compiler |
<<<<<<<
import { AboutRoutes } from './+about/index';
import { HomeRoutes } from './+home/index';
import { ChartsRoutes } from './+charts/index';
=======
import { AboutRoutes } from './about/index';
import { HomeRoutes } from './home/index';
>>>>>>>
import { AboutRoutes } from './about/index';
import { HomeRoutes } ... |
<<<<<<<
this.containerLoader.registerAllHook(MidwayHandlerKey.CONFIG, (key) => {
return safelyGet(key, this.config);
=======
this.containerLoader.registerAllHook(MidwayHandlerKey.CONFIG, (key: string) => {
return this.config[key];
>>>>>>>
this.containerLoader.registerAllHook(MidwayHandlerKey.... |
<<<<<<<
const assert = require('assert');
=======
import { mm as mock, MockContainer } from '../src/';
>>>>>>>
const assert = require('assert');
import { mm as mock, MockContainer } from '../src/';
<<<<<<<
it('should mm function be ok', async () => {
const service: any = await app.applicationContext.getAsync... |
<<<<<<<
import { docCopy } from "./es/documentation"
import { indexCopy } from "./en/index"
=======
import { docCopy } from "./en/documentation"
import { indexCopy } from "./es/index"
>>>>>>>
import { docCopy } from "./es/documentation"
import { indexCopy } from "./es/index" |
<<<<<<<
throw new Error('Could not find a path for ' + path + optionalExampleContent)
=======
const localeDesc = lang === "en" ? lang : `either ${lang} or English`
throw new Error('Could not find a path for ' + path + " in " + localeDesc)
>>>>>>>
const localeDesc = lang === "en" ? lang : `eith... |
<<<<<<<
{ id: "react-&-webpack", title: "React & Webpack" },
{ id: "babel-with-typescript", title: "Using Babel with TypeScript" },
=======
>>>>>>>
{ id: "babel-with-typescript", title: "Using Babel with TypeScript" }, |
<<<<<<<
import { DBUtils } from './dbUtils';
=======
>>>>>>>
import { DBUtils } from './dbUtils'; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
/**
* Dashboard canvas width (default is 1280).
*/
>>>>>>>
/**
* Dashboard canvas width (default is 1280).
*/ |
<<<<<<<
import { DashboardWidget } from './widget';
import { saveDialog } from './dialog';
import { Icons } from './icons';
import { Widgetstore } from './widgetstore';
import { addCellId, addNotebookId } from './utils';
import { openfullscreen } from './fullscreen';
import { DBUtils } from './dbUtils';
export fu... |
<<<<<<<
// import { Widgetstore } from './widgetstore';
// import { addCellId, addNotebookId } from './utils';
import { DBUtils } from './dbUtils';
=======
>>>>>>>
import { DBUtils } from './dbUtils';
<<<<<<<
utils: this._utils,
=======
>>>>>>>
utils: this._utils,
<<<<<<<
private _app: Ju... |
<<<<<<<
if (options.mode === 'edit') {
this._corner.addClass(EDITABLE_CORNER_CLASS);
}
this._mode = options.mode;
}
public get corner(): Widget {
return this._corner;
=======
if (options.mode === 'edit') {
this._corner.addClass(EDITABLE_CORNER_CLASS);
}
this._mode = op... |
<<<<<<<
// Adds buttons to dashboard toolbar.
buildToolbar(this, panel, outputTracker, clipboard);
// TODO: Figure out if this is worth it. Right now it's disabled to prevent
// double updating, and I figure manually calling this.update() whenever the
// widgetstore is modified isn't so bad.
//... |
<<<<<<<
import { unsaveDialog } from './dialog';
import { DBUtils } from './dbUtils';
=======
>>>>>>>
import { unsaveDialog } from './dialog';
import { DBUtils } from './dbUtils';
<<<<<<<
this.setName(options.name || 'Unnamed Dashboard');
this._contentsManager = utils.contents;
=======
this.setNa... |
<<<<<<<
// coinbase = accounts[0];
// First account is used as the Safe relayer account
defaultAccountBox[0] = accounts[2];
safeOwnerBox[0] = accounts[3];
=======
defaultAccountBox[0] = accounts[1] || accounts[0];
safeOwnerBox[0] = accounts[2] || defaultAccountBox[0];
>>>>>>>
// First acc... |
<<<<<<<
dependency,
encryptPassword,
=======
>>>>>>>
dependency, |
<<<<<<<
// mock Gnosis Safe provider
return signer.sendTransaction({ gasLimit: gas, ...txObj });
=======
// mock WalletConnected Gnosis Safe provider
return (await signer.sendTransaction({ gasLimit: gas, ...txObj })).hash;
>>>>>>>
// mock Gnosis Safe provider
... |
<<<<<<<
import SafeAppsSDK, { SafeInfo, TxServiceModel } from '@gnosis.pm/safe-apps-sdk'
import { SimpleTransactionResult, StandardSafeAppsTransaction } from '../utils/transactions'
interface SafeTransactionParams {
safeTxGas?: number
=======
import initSdk, {
RequestId,
SafeInfo,
SdkInstance,
TxConfirmati... |
<<<<<<<
ApiDefineSecurityScheme,
ApiResponse,
ApiSecurityRequirement,
Class,
Config,
Context,
Hook,
HookDecorator,
HttpResponse,
=======
Class,
ClassOrAbstractClass,
Config,
Context,
Hook,
HookDecorator,
HttpResponse,
>>>>>>>
ApiDefineSecurityScheme,
ApiResponse,
ApiSecurityRequ... |
<<<<<<<
import TestFile from './TestFile';
import {CoverageCollection} from './api/CoverageResult';
=======
import {CoverageCollection} from './api/test_runner';
>>>>>>>
import TestFile from './TestFile';
import {CoverageCollection} from './api/test_runner'; |
<<<<<<<
currentTrackMetadata: currentTrackId
? singleMetadataSelector(state, currentTrackId)
: null,
domain: document.location.host,
=======
currentTrackMetadata: meta,
>>>>>>>
currentTrackMetadata: meta,
domain: document.location.host, |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.