conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
import { CustomFormValidators } from '../../../ui/validators/custom-form-validators';
import { AuthService, RoutingService } from '@spartacus/core';
>>>>>>> |
<<<<<<<
countries: fromCountries.DeliveryCountriesState;
=======
deliveryCountries: fromCountries.DeliveryCountriesState;
titles: fromTitles.TitlesState;
>>>>>>>
countries: fromCountries.DeliveryCountriesState;
titles: fromTitles.TitlesState;
<<<<<<<
countries: fromCountries.reducer
=======
delivery... |
<<<<<<<
import {
OccModule,
UiModule,
CmsLibModule,
UiFrameworkModule } from 'storefrontlib';
import {
CmsModule,
RoutingModule,
SiteContextModule,
ProductModule } from 'storefrontlib';
import { appRoutes } from './app.routes';
=======
import { RoutingModule } from 'storefrontlib';
import { OccModul... |
<<<<<<<
userDetails: fromUserDetailsReducer.UserDetailsState;
token: fromUserToken.UserTokenState;
=======
auth: fromUserToken.UserTokenState;
// TODO user-details here
>>>>>>>
userDetails: fromUserDetailsReducer.UserDetailsState;
auth: fromUserToken.UserTokenState;
<<<<<<<
userDetails: fromUserDetail... |
<<<<<<<
import { SiteContextConfig, ConfigurableRoutesService } from '@spartacus/core';
=======
import { SiteContextConfig } from '@spartacus/core';
import { GlobalMessageService } from '../../../global-message/facade/global-message.service';
>>>>>>>
import { SiteContextConfig, ConfigurableRoutesService } from '@spa... |
<<<<<<<
import { CmsPageGuards } from './newcms/guards/cms-page.guard';
import { ProductGuard } from './product/guards/product.guard';
=======
import { CmsPageGuards } from './cms/guards/cms-page.guard';
>>>>>>>
import { CmsPageGuards } from './cms/guards/cms-page.guard';
import { ProductGuard } from './product/guar... |
<<<<<<<
import { StoreListPageModule } from './store-list-page/store-list-page.module';
=======
import { StoreDescriptionPageModule } from './store-description-page/store-description-page.module';
>>>>>>>
import { StoreListPageModule } from './store-list-page/store-list-page.module';
import { StoreDescriptionPageM... |
<<<<<<<
import { Header } from './../cmslib/header.po';
import { browser, element, by, ElementFinder } from 'protractor';
=======
import { browser } from 'protractor';
>>>>>>>
import { browser, ElementFinder } from 'protractor'; |
<<<<<<<
export * from './src/occ/index';
export * from './src/route/index';
=======
export * from './src/occ/index';
export * from './src/routing/index';
>>>>>>>
export * from './src/occ/index';
export * from './src/route/index';
export * from './src/routing/index'; |
<<<<<<<
import { ReactiveFormsModule } from '@angular/forms';
=======
>>>>>>>
<<<<<<<
import { RouterTestingModule } from '@angular/router/testing';
import { Component, Input } from '@angular/core';
import { StoreModule } from '@ngrx/store';
import {
NgbTabsetModule,
NgbAccordionModule
} from '@ng-bootstrap/n... |
<<<<<<<
import { Component, OnInit } from '@angular/core';
import { ATHSPrompt } from '../../../../pwa/addToHomScreen';
=======
import { Component, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Subscription } from 'rxjs';
>>>>>>>
import { ATHSPrompt } from '../../../../pwa/add... |
<<<<<<<
=======
import * as fromAuthStore from '../../../auth/store';
import * as fromRouting from '../../../routing/store';
>>>>>>>
import * as fromAuthStore from '../../../auth/store'; |
<<<<<<<
deliveryAddress$: Observable<any>;
=======
titles$: Observable<any>;
>>>>>>>
deliveryAddress$: Observable<any>;
titles$: Observable<any>;
<<<<<<<
this.deliveryAddress$ = this.store
.select(fromCheckoutStore.getDeliveryAddress)
.pipe(
filter(deliveryAddress => Object.keys(del... |
<<<<<<<
import { AuthModuleConfig, ServerConfig, SiteContextConfig } from '@spartacus/core';
=======
import { OccConfig } from '@spartacus/core';
import { AuthModuleConfig } from '../auth/auth-module.config';
>>>>>>>
import { AuthModuleConfig, ServerConfig, OccConfig } from '@spartacus/core'; |
<<<<<<<
import { ContactPageModule } from './contact-page/contact-page.module';
=======
import { HelpPageModule } from './help-page/help-page.module';
import { ResetNewPasswordPageModule } from './reset-new-password-page/reset-new-password-page.module';
>>>>>>>
import { ContactPageModule } from './contact-page/cont... |
<<<<<<<
import { SalePageModule } from './sale-page/sale-page.module';
=======
import { HelpPageModule } from './help-page/help-page.module';
import { ResetNewPasswordPageModule } from './reset-new-password-page/reset-new-password-page.module';
>>>>>>>
import { SalePageModule } from './sale-page/sale-page.module';
... |
<<<<<<<
import { UserLoaderService } from '../data/user-loader.service';
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { UserTokenInterceptor } from './http-interceptors/user-token.interceptor';
=======
import { OccUserService } from '../newocc/user/user.service';
>>>>>>>
import { OccUserService }... |
<<<<<<<
import { combineReducers, StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { SiteContextConfig } from '@spartacus/core';
=======
import { StoreModule } from '@ngrx/store';
>>>>>>>
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects'... |
<<<<<<<
import { PwaModule } from './../../../pwa/pwa.module';
import {
PWAModuleConfig,
defaultPWAModuleConfig
} from '../../../pwa/pwa.module-config';
=======
import { SiteContextConfig } from '@spartacus/core';
>>>>>>>
import { PwaModule } from './../../../pwa/pwa.module';
import {
PWAModuleConfig,
defaul... |
<<<<<<<
@Input() locationId: number = null;
@Output() storeItemClick: EventEmitter<number> = new EventEmitter();
readonly daysOfWeek = ['Mon', 'Tues', 'Wed', 'Thurs', 'Fri', 'Sat', 'Sun'];
=======
readonly current_date = new Date();
>>>>>>>
@Input() locationId: number = null;
@Output() storeItemClick: Ev... |
<<<<<<<
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Component, Input } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { of, BehaviorSubject } from 'rxjs';
import { By } from '@angular/platform-browser';
=======
import { ComponentFixture, TestBed }... |
<<<<<<<
@Component({ selector: 'cx-add-to-home-screen-banner', template: '' })
class MockAddtoHomeScreenBannerComponent {}
class CheckoutServiceMock {
entries;
orderDetails = {
=======
const mockCheckoutService = {
orderDetails$: of({
>>>>>>>
@Component({ selector: 'cx-add-to-home-screen-banner', template: ''... |
<<<<<<<
StoreDescriptionPageModule,
=======
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
>>>>>>>
StoreDescriptionPageModule,
ContactPageModule,
SalePageModule,
HelpPageModule,
ResetNewPasswordPageModule,
<<<<<<<
StoreDescriptionPageModule... |
<<<<<<<
import { ProductSearchService } from '../../../facade/product-search.service';
import { ActivatedRoute } from '@angular/router';
=======
import { ProductSearchService } from '@spartacus/core';
>>>>>>>
import { ActivatedRoute } from '@angular/router';
import { ProductSearchService } from '@spartacus/core'; |
<<<<<<<
export * from './checkout.selectors';
export * from './delivery-countries.selectors';
=======
export * from './delivery-countries.selectors';
export * from './titles.selectors';
>>>>>>>
export * from './checkout.selectors';
export * from './delivery-countries.selectors';
export * from './titles.selectors'; |
<<<<<<<
import { UserOrdersEffect } from './user-orders.effect';
=======
import { TitlesEffects } from './titles.effect';
import { DeliveryCountriesEffects } from './delivery-countries.effect';
>>>>>>>
import { UserOrdersEffect } from './user-orders.effect';
import { TitlesEffects } from './titles.effect';
import { ... |
<<<<<<<
import * as fromStore from './../../store';
import * as fromAuthStore from '@auth/store';
import { tap, map, take, filter } from 'rxjs/operators';
=======
import { Observable, Subscription } from 'rxjs';
>>>>>>>
import { Observable, Subscription } from 'rxjs';
import { UserToken } from '../../../auth/models... |
<<<<<<<
let pulsetime = 1000;
@Component({
selector: 'abstractsection',
templateUrl: './section.component.html',
})
=======
>>>>>>>
let pulsetime = 1000;
@Component({
selector: 'abstractsection',
templateUrl: './section.component.html',
})
<<<<<<<
protected circles: Circle[] = [];
public... |
<<<<<<<
console.log("Start query", performance.now());
this.device.query(fromDate, toDate);
=======
this.device.query(fromDate, toDate, { ess0: ["Soc", "ActivePower"] });
>>>>>>>
this.device.query(fromDate, toDate); |
<<<<<<<
progressActions: IProgressAction[];
currentProgressActionIndex?: number;
dateTimeValue: Date;
richTextValue: string;
=======
currentCarouselElement: JSX.Element;
canMovePrev: boolean;
canMoveNext: boolean;
>>>>>>>
progressActions: IProgressAction[];
currentProgressActionIndex?: number;
d... |
<<<<<<<
export * from './WebPartTitle';
export * from './ListPicker';
=======
export * from './WebPartTitle';
export * from './IFrameDialog';
export * from './Common';
export * from './Utilities';
export * from './IFrameDialog';
export * from './FieldCommon';
export * from './FieldAttachmentsRenderer';
export * from... |
<<<<<<<
const web = Web(webAbsoluteUrl);
=======
const web = new Web(webAbsoluteUrl);
folderRelativeUrl = folderRelativeUrl.replace(/\'/ig, "''");
>>>>>>>
const web = Web(webAbsoluteUrl);
folderRelativeUrl = folderRelativeUrl.replace(/\'/ig, "''"); |
<<<<<<<
// folder explorer
NewFolderNamePlaceholder: string;
FolderFilterBoxPlaceholder: string;
FolderExplorerLoading: string;
FolderExplorerNoItems: string;
=======
//Icon picker
SelectedLabel: string;
SelectIcon: string;
>>>>>>>
// folder explorer
NewFolderNamePlaceholder: string;
FolderF... |
<<<<<<<
export interface IFunction {
name: string;
=======
interface IFunction {
>>>>>>>
export interface IFunction {
<<<<<<<
export interface IFunctionOptions {
volatile: boolean;
stream: boolean;
=======
interface IFunctionOptions {
>>>>>>>
export interface IFunctionOptions { |
<<<<<<<
if (!firebaseInitialized) return
const unsubscribe = firebase.auth().onAuthStateChanged((newUser) => {
=======
const unsubscribe = firebase.auth().onAuthStateChanged(newUser => {
>>>>>>>
const unsubscribe = firebase.auth().onAuthStateChanged((newUser) => { |
<<<<<<<
const svnConfig = workspace.getConfiguration(
"svn",
Uri.file(repository.workspaceRoot)
);
=======
const svnConfig = workspace.getConfiguration("svn");
>>>>>>>
const svnConfig = workspace.getConfiguration("svn");
<<<<<<<
private getSCMResource(uri?: Uri): Resource | undefined {... |
<<<<<<<
<mat-form-field
[class]="options?.htmlClass || null"
[floatPlaceholder]="options?.floatPlaceholder || (options?.notitle ? 'never' : 'auto')"
[style.width]="'100%'">
<span matPrefix *ngIf="options?.prefix || options?.fieldAddonLeft"
[innerHTML]="options?.prefix || options?.fie... |
<<<<<<<
search: async (_, data, { vtex: ioContext }: ColossusContext, info) => {
const { map, query, rest } = data
const facetsMap = map.split(',').slice(0, query.split('/').length).join(',')
const queryWithRest = query + (rest && '/' + rest.replace(/,/g, '/'))
const facetsValue = query + '?map=' + f... |
<<<<<<<
<md-select #inputControl *ngIf="isConditionallyShown()"
[(ngModel)]="controlValue"
=======
<md-select #inputControl
>>>>>>>
<md-select #inputControl *ngIf="isConditionallyShown()" |
<<<<<<<
=======
import { FrameworkLibraryService } from './framework-library/framework-library.service';
>>>>>>>
<<<<<<<
=======
],
providers: [
JsonSchemaFormService, FrameworkLibraryService
>>>>>>> |
<<<<<<<
<mat-form-field
[class]="options?.htmlClass || null"
=======
<md-form-field *ngIf="isConditionallyShown()"
>>>>>>>
<mat-form-field *ngIf="isConditionallyShown()"
[class]="options?.htmlClass || null"
<<<<<<<
if (!this.options.notitle && !this.options.description && this.options.pl... |
<<<<<<<
errorMessage: string;
orgChartEnabled: boolean;
=======
inputDebounce: number;
>>>>>>>
errorMessage: string;
inputDebounce: number;
orgChartEnabled: boolean; |
<<<<<<<
.config(translations)
.service('PeopleService', PeopleService)
.service('ConfigService', ConfigService);
=======
.config(['$translateProvider', ($translateProvider: angular.translate.ITranslateProvider) => {
$translateProvider.translations('en', require('i18n/translations_en.json'));
... |
<<<<<<<
import {
CreateUserDto,
CreateUserProfileDto,
CreateCloseContactsRequestDto,
} from './dto/create-user.dto'
import { User } from './interfaces/user.interface'
=======
import { CreateUserDto, CreateUserProfileDto } from './dto/create-user.dto'
import { User } from './classes/user.class'
>>>>>>>
import {... |
<<<<<<<
import * as Dropzone from 'dropzone';
import { Directive, Optional, OnInit, DoCheck, OnChanges, OnDestroy, Input, Output,
NgZone, EventEmitter, ElementRef, Renderer, SimpleChanges, KeyValueDiffers } from '@angular/core';
=======
import { Directive, Optional, OnInit, DoCheck, OnChanges, OnDestroy, Input, Ou... |
<<<<<<<
import { depositToken, issueToken, provider } from './utils';
import { TransferStatus } from '../src/pods/transfer/transfer-status';
=======
import { depositToken, issueToken, provider, MWh } from './utils';
>>>>>>>
import { depositToken, issueToken, provider, MWh } from './utils';
import { TransferStatus } ... |
<<<<<<<
@Post(`${CERTIFICATION_REQUEST_ENDPOINT}/:id`)
@UseGuards(AuthGuard(), UserGuard, RolesGuard)
=======
@Post(CERTIFICATION_REQUEST_ENDPOINT)
@UseGuards(AuthGuard(), RolesGuard)
>>>>>>>
@Post(CERTIFICATION_REQUEST_ENDPOINT)
@UseGuards(AuthGuard(), UserGuard, RolesGuard) |
<<<<<<<
import { Certificate } from './pods/certificate/certificate.entity';
=======
>>>>>>>
import { Certificate } from './pods/certificate/certificate.entity'; |
<<<<<<<
export class Asset extends BaseEntity implements IAsset {
=======
export class Asset extends ExtendedBaseEntity {
>>>>>>>
export class Asset extends ExtendedBaseEntity implements IAsset { |
<<<<<<<
async getAllLogDeviceStatusChangedEvents(eventFilter?: PastEventOptions) {
return this.web3Contract.getPastEvents('DeviceStatusChanged', eventFilter);
=======
async getAllLogDeviceSetActiveEvents(eventFilter?: PastEventOptions) {
return this.web3Contract.getPastEvents('LogDeviceSetActi... |
<<<<<<<
return parseInt(process.env.PORT, 10) || parseInt(process.env.BACKEND_PORT, 10) || 3030;
}
export function getEventsServerPort(): number {
return getPort() + 1;
=======
return parseInt(process.env.BACKEND_PORT, 10) || 3030;
>>>>>>>
return parseInt(process.env.PORT, 10) || parseInt(process.en... |
<<<<<<<
import { BigNumber } from 'ethers/utils';
=======
export const MAX_ENERGY_PER_CERTIFICATE = 1e16;
>>>>>>>
import { BigNumber } from 'ethers/utils';
export const MAX_ENERGY_PER_CERTIFICATE = 1e16; |
<<<<<<<
export class Order extends BaseEntity {
constructor(order: Partial<Order>) {
super();
Object.assign(this, order);
}
=======
export class Order extends ExtendedBaseEntity {
>>>>>>>
export class Order extends ExtendedBaseEntity {
constructor(order: Partial<Order>) {
super()... |
<<<<<<<
rights
=======
autoPublish,
rights,
status,
kycStatus
>>>>>>>
rights,
status,
kycStatus
<<<<<<<
rights
=======
autoPublish,
rights,
status,
... |
<<<<<<<
getOwnBundles(): Promise<Bundle[]>;
=======
getBundleSplits(bundle: Bundle): Promise<Bundle[]>;
>>>>>>>
getOwnBundles(): Promise<Bundle[]>;
getBundleSplits(bundle: Bundle): Promise<Bundle[]>;
<<<<<<<
public async getOwnBundles() {
const response = await this.requestClient.get<unk... |
<<<<<<<
import { marketContractLookupGetAction } from './controller/MarketContractLookupGet';
import { marketContractLookupPostAction } from './controller/MarketContractLookupPost';
import { marketContractLookupDeleteAction } from './controller/MarketContractLookupDelete';
import { jsonEntityGetAction } from './control... |
<<<<<<<
import { NewDeviceDTO } from './new-device.dto';
=======
import { NewDeviceDTO } from './dto/new-device.dto';
import { ValidateDeviceOwnershipQuery } from './queries/validate-device-ownership.query';
>>>>>>>
import { NewDeviceDTO } from './dto/new-device.dto'; |
<<<<<<<
=======
import { Organization } from './pods/organization/organization.entity';
import { User } from './pods/user/user.entity';
import { Device } from './pods/device/device.entity';
import { Demand } from './pods/demand/demand.entity';
import { UserModule } from './pods/user/user.module';
>>>>>>>
<<<<<<<
i... |
<<<<<<<
PinchZoomInteractionComponent, TranslateInteractionComponent,
=======
PinchZoomInteractionComponent, ModifyInteractionComponent,
>>>>>>>
PinchZoomInteractionComponent, ModifyInteractionComponent, TranslateInteractionComponent,
<<<<<<<
TranslateInteractionComponent,
=======
ModifyInteractionComp... |
<<<<<<<
PinchZoomInteractionComponent, DrawInteractionComponent, SelectInteractionComponent, ModifyInteractionComponent,
=======
PinchZoomInteractionComponent, ModifyInteractionComponent, TranslateInteractionComponent,
DrawInteractionComponent,
>>>>>>>
PinchZoomInteractionComponent, DrawInteractionCompone... |
<<<<<<<
this.exercise = exerciseResponse.body!;
this.exercise.isAtLeastTutor = this.accountService.isAtLeastTutorInCourse(this.exercise!.course!);
this.exercise.participations = cachedParticipations;
=======
this.exercise = exerciseResponse.body;
... |
<<<<<<<
constructor(
private languageService: JhiLanguageService,
private principal: Principal,
private websocketService: JhiWebsocketService,
private authServerProvider: AuthServerProvider
) {}
=======
constructor(private principal: Principal, private trackerService: JhiTr... |
<<<<<<<
const isInstructorInCourse = this.participation.student == null && this.accountService.isAtLeastInstructorInCourse(exercise.course!);
const isSameUser = this.participation.student && user!.id === this.participation.student.id;
const exerciseNotOver = exercise.dueDate == null ... |
<<<<<<<
=======
accepted: boolean;
handled: boolean;
>>>>>>>
accepted: boolean;
handled: boolean;
<<<<<<<
this.jhiAlertService.success('arTeMiSApp.complaint.submitted');
this.submittedDate = res.body!.submittedTime!;
=======
this.submittedDate = res.... |
<<<<<<<
const billingGroup = projectOpenShift.groups.find(i => i.type == "billing" ) || ""
if (billingGroup.uptimeRobotStatusPageId && !R.isEmpty(billingGroup.uptimeRobotStatusPageId)){
uptimeRobotStatusPageIds.push(billingGroup.uptimeRobotStatusPageId)
}
var uptimeRobotStatusPageId = uptimeRobotS... |
<<<<<<<
export function CurrentToken(): Expr
=======
export function HasCurrentIdentity(): Expr
>>>>>>>
export function HasCurrentIdentity(): Expr
export function CurrentToken(): Expr |
<<<<<<<
export function HasCurrentToken(): Expr
=======
export function HasCurrentIdentity(): Expr
export function CurrentToken(): Expr
>>>>>>>
export function HasCurrentIdentity(): Expr
export function CurrentToken(): Expr
export function HasCurrentToken(): Expr |
<<<<<<<
market.authenticate(property.address, '', '', '', '', '')
watch(dev.metricsFactory, WEB3_URI)('Create', (_, values) =>
=======
market.authenticate(property.address, 'id1', '', '', '', '')
watch(dev.metricsFactory, uri)('Create', (_, values) =>
>>>>>>>
market.authenticate(property.address, 'id1... |
<<<<<<<
const block = await getBlock()
await this._lockup.createStorage()
await this._lockup.setDIP4GenesisBlock(block)
=======
>>>>>>>
const block = await getBlock() |
<<<<<<<
import * as util from './lib/util';
import Connection from './lib/connection';
import AuthInfo from './lib/authInfo';
=======
import * as util from './lib/util';
>>>>>>>
import Connection from './lib/connection';
import AuthInfo from './lib/authInfo';
import * as util from './lib/util';
<<<<<<<
LoggerL... |
<<<<<<<
describe('findUpperCaseKeys', () => {
it('should return the first upper case key', () => {
const testObj = { lowercase: true, UpperCase: false, nested: { camelCase: true } };
expect(SfdxUtil.findUpperCaseKeys(testObj)).to.equal('UpperCase');
});
it('should re... |
<<<<<<<
import { Signale } from 'signale'
import Context from './context'
=======
import { Context } from './context'
>>>>>>>
import { Signale } from 'signale'
import { Context } from './context' |
<<<<<<<
describe('#warnForMissingEnvVars', () => {
it('throws with the expected string', () => {
delete process.env.HOME
expect(() => new Toolkit()).toThrowErrorMatchingSnapshot()
})
=======
describe('Toolkit#constructor', () => {
let logger: any
let exit: (code?: number) => never
beforeE... |
<<<<<<<
private menuManager: MenuManager;
=======
private descriptionManager: DescriptionManager;
>>>>>>>
private menuManager: MenuManager;
private descriptionManager: DescriptionManager; |
<<<<<<<
import { types } from "@cosmwasm/sdk";
=======
>>>>>>>
<<<<<<<
export declare type TokenConfiguration = readonly (types.TokenInfo & {
=======
import { TokenInfo } from "./types";
export declare type TokenConfiguration = readonly (TokenInfo & {
>>>>>>>
import { TokenInfo } from "./types";
export declare t... |
<<<<<<<
=======
import { Decimal } from "@iov/encoding";
import amino from "@tendermint/amino-js";
>>>>>>>
import { Decimal } from "@iov/encoding";
<<<<<<<
export declare function decodeFullSignature(signature: types.StdSignature, nonce: number): FullSignature;
export declare function decodeAmount(tokens: TokenInfo... |
<<<<<<<
/**
* a.multiply(b) returns a*b.
*
* We only allow multiplication by unsigned integers to avoid rounding errors.
*/
multiply(b: Uint32 | Uint53 | Uint64): Decimal;
=======
/**
* a.minus(b) returns a-b.
*
* Both values need to have the same fractional digits.
* The resulting diffe... |
<<<<<<<
import { coinToDecimal, TxsResponse, types } from "@cosmwasm/sdk";
=======
import { isAminoStdTx, TxsResponse } from "@cosmwasm/sdk";
>>>>>>>
import { TxsResponse, types } from "@cosmwasm/sdk";
<<<<<<<
import { Encoding } from "@iov/encoding";
=======
import { Decimal, Encoding } from "@iov/encoding";
imp... |
<<<<<<<
=======
/**
* @returns {TStatement[]}
*/
protected getNodeStructure (): TStatement[] {
const decodeNodeTemplate: string = this.getDecodeStringArrayTemplate();
return NodeUtils.convertCodeToStructure(
JavaScriptObfuscator.obfuscate(
StringArrayCal... |
<<<<<<<
=======
import {SignalToValue} from '../../Core/Audio/Components/SignalToValue';
import {GranularVoice} from './GranularComponents/GranularVoice';
import {Grain} from './GranularComponents/Grain';
>>>>>>> |
<<<<<<<
import { GraphQLContext } from "./types";
=======
import { GraphQLMiddlewarePlugin, Context } from "./types";
>>>>>>>
import { Context } from "./types"; |
<<<<<<<
export class MenuItem {
=======
import MainScene = require("./../MainScene");
import Grid = require("./../Grid");
import IBlock = require("../Blocks/IBlock");
import LFO = require("../Blocks/Effects/Pre/LFO");
import Recorder = require("../Blocks/Sources/Recorder");
import Size = minerva.Size;
import IApp = ... |
<<<<<<<
export class AccumulativeConnectionMethod extends ConnectionManager {
=======
import IApp = require("../../../../IApp");
declare var App: IApp;
class AccumulativeConnectionMethod extends ConnectionManager {
>>>>>>>
declare var App: IApp;
export class AccumulativeConnectionMethod extends ConnectionManager ... |
<<<<<<<
export class MoveBlockCommandHandler implements ICommandHandler {
=======
import IApp = require("../IApp");
declare var App: IApp;
class MoveBlockCommandHandler implements ICommandHandler {
>>>>>>>
declare var App: IApp;
export class MoveBlockCommandHandler implements ICommandHandler { |
<<<<<<<
static InputManager: InputManager;
=======
static Particles: Particle[];
>>>>>>>
static InputManager: InputManager;
static Particles: Particle[];
<<<<<<<
App.InputManager = new InputManager();
=======
App.Particles = [];
>>>>>>>
App.InputManager = new InputManager... |
<<<<<<<
public Sources: Tone.Oscillator[];
=======
public Source: Tone.Oscillator;
>>>>>>>
public Sources: Tone.Oscillator[];
<<<<<<<
// is there specific source to attack?
//if (env){
this.Envelopes[0].triggerAttack();
//} else {
// // Else attack ... |
<<<<<<<
export class SaveAsCommandHandler implements ICommandHandler {
=======
import IApp = require("../IApp");
declare var App: IApp;
class SaveAsCommandHandler implements ICommandHandler {
>>>>>>>
declare var App: IApp;
export class SaveAsCommandHandler implements ICommandHandler { |
<<<<<<<
import { ErrorResponse, NotFoundResponse, Response } from "@webiny/graphql";
import { FormsCRUD } from "../../../types";
=======
import { ErrorResponse, NotFoundResponse, Response } from "@webiny/handler-graphql/responses";
>>>>>>>
import { ErrorResponse, NotFoundResponse, Response } from "@webiny/handler-gr... |
<<<<<<<
export class BlockSprites {
=======
import IBlock = require("./IBlock");
import Grid = require("../Grid");
import DisplayObject = require("../DisplayObject");
import MainScene = require("../MainScene");
import IApp = require("../IApp");
declare var App: IApp;
class BlockSprites {
>>>>>>>
declare var App: ... |
<<<<<<<
=======
this.ConnectionLines = new ConnectionLines();
this.ConnectionLines.Init(this);
>>>>>>>
this.ConnectionLines = new ConnectionLines();
this.ConnectionLines.Init(this);
<<<<<<<
this._LaserBeams = new LaserBeams();
this.DisplayList.Add(this._LaserBeams);... |
<<<<<<<
export class Pitch extends PostEffect {
=======
import IApp = require("../../../IApp");
declare var App: IApp;
class Pitch extends PostEffect {
>>>>>>>
declare var App: IApp;
export class Pitch extends PostEffect { |
<<<<<<<
=======
import {MainScene} from './../MainScene';
import {Line} from '../MathObjects/Line';
import {LineList} from '../MathObjects/LineList';
>>>>>>>
import {Line} from '../MathObjects/Line';
import {LineList} from '../MathObjects/LineList';
<<<<<<<
Init(drawTo: IDisplayContext): void {
super.In... |
<<<<<<<
/**
* Created by luketwyman on 12/07/2015.
*/
import MainScene = require("./../MainScene");
import IEffect = require("../Blocks/IEffect");
import ISource = require("../Blocks/ISource");
import IBlock = require("../Blocks/IBlock");
import DisplayObject = require("../DisplayObject");
import Recorder = require("... |
<<<<<<<
import PreEffect = require("../PreEffect");
import ISource = require("../../ISource");
import Grid = require("../../../Grid");
import MainScene = require("../../../MainScene");
import AudioChain = require("../../../Core/Audio/Connections/AudioChain");
import ISketchContext = Fayde.Drawing.ISketchContext;
=====... |
<<<<<<<
export class Sampler extends SamplerBase {
=======
import IApp = require("../../IApp");
declare var App: IApp;
class Sampler extends SamplerBase {
>>>>>>>
declare var App: IApp;
export class Sampler extends SamplerBase { |
<<<<<<<
import Keyboard = require("./Keyboard");
import Voice = require("./VoiceObject");
import ISource = require("../ISource");
import MainScene = require("../../MainScene");
import Microphone = require("../Sources/Microphone");
import Power = require("../Power/Power");
import AudioChain = require("../../Core/Audio/C... |
<<<<<<<
=======
import EarlyDotRefreshes from './modules/features/EarlyDotRefreshes';
import EarlyDotRefreshesInstants from './modules/features/EarlyDotRefreshesInstants';
import BalanceOfAllThingsOpener from './modules/features/BalanceOfAllThingsOpener';
import Buffs from './modules/features/Buffs';
//Talents
import... |
<<<<<<<
export class ParticleEmitter extends PowerSource {
=======
import IApp = require("../../IApp");
declare var App: IApp;
class ParticleEmitter extends PowerSource {
>>>>>>>
declare var App: IApp;
export class ParticleEmitter extends PowerSource { |
<<<<<<<
public Params: any;
=======
public PolySources: any[];
public PolyEnvelopes: any[];
//public Params: any;
>>>>>>>
//public Params: any;
<<<<<<<
CreateSource(){}
=======
Stop() {
this.TriggerRelease();
}
TriggerAttack(){
>>>>>>>
CreateSource(){}
<<<<<<<
... |
<<<<<<<
export class ComputerKeyboard extends Keyboard {
=======
import IApp = require("../../IApp");
declare var App: IApp;
class ComputerKeyboard extends Keyboard {
>>>>>>>
declare var App: IApp;
export class ComputerKeyboard extends Keyboard { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.