conflict_resolution
stringlengths
27
16k
<<<<<<< var howItWorksGomesaPageFrontmatter = "---"+os.EOL+ "title: Gulf of Mexico Energy Security Act (GOMESA) | How It Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/gomesa/"+os.EOL+ "---"+os.EOL; ======= var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+ ...
<<<<<<< const {getHMDType, FakeMesher, FakePlaneTracker} = require('./VR.js'); ======= const {getHMDType, lookupHMDTypeIndex} = require('./VR.js'); >>>>>>> const {getHMDType, lookupHMDTypeIndex, FakeMesher, FakePlaneTracker} = require('./VR.js'); <<<<<<< ======= result.hmdType = _makeTypedArray(Uint32Array, 1);...
<<<<<<< var companyList = root.select('#companies'); var getter = eiti.data.getter; var throttle = eiti.util.throttle; var grouper; var formatNumber = eiti.format.commaSeparatedDollars; var formatPercent = eiti.format.percent; var dialogWithExtension = document.querySelector('.flowchart-dialog.fl...
<<<<<<< var howItWorksAuditsPageFrontmatter = "---"+os.EOL+ "title: Audits and Assurances | How It Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/audits-and-assurances/"+os.EOL+ "---"+os.EOL; ======= var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+ "title...
<<<<<<< else if(path.includes("/historic-preservation-fund") && !lastFourteen.includes("default-page")){ loader.addPagesArray([{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-h...
<<<<<<< var howItWorksAuditsPageFrontmatter = "---"+os.EOL+ "title: Audits and Assurances | How It Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/audits-and-assurances/"+os.EOL+ "---"+os.EOL; ======= var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+ "title...
<<<<<<< import {UpdateFlag} from '../components/layouts/UpdateFlag' ======= import {DownloadDataLink} from '../components/layouts/icon-links/DownloadDataLink' import IconArchive from '-!svg-react-loader!../img/svg/icon-archive.svg'; import {DataArchiveLink} from '../components/layouts/icon-links/DataArchiveLink'; imp...
<<<<<<< ======= [CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY]: this.props.productionVolumesByMonth(CONSTANTS.PRODUCTION_VOLUMES_OIL_KEY, {...FILTER_PRODUCTION_VOLUMES_BY_MONTH, period:dropDownValue }, OPTIONS_PRODUCTION_VOLUMES_BY_MONTH), [CONSTANTS.PRODUCTION_VOLUMES_GAS_KEY]: this.props.productionVolum...
<<<<<<< var howItWorksRevenuesPageFrontmatter = "---"+os.EOL+ "title: Revenues | How It Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/revenues/"+os.EOL+ "---"+os.EOL; var howItWorksAmlPageFrontmatter = "---"+os.EOL+ "title: AML Reclamation Program | How It Works"+os...
<<<<<<< var howItWorksHpfPageFrontmatter = "---"+os.EOL+ "title: Historic Preservation Fund | How It Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/historic-preservation-fund/"+os.EOL+ "---"+os.EOL; ======= var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+ ...
<<<<<<< var howItWorksNativeProductionPageFrontmatter = "---"+os.EOL+ "title: Native American Lands | Natural Resource Production"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/native-american-production/"+os.EOL+ "redirect_from: /how-it-works/tribal-production/"+os.EOL+ "...
<<<<<<< this.activeSourceHandle = handle; this.activeSource = source; this.emit('change'); ======= this.pinnedSourceHandle = handle; this.pinnedSource = source; >>>>>>> this.activeSourceHandle = handle; this.activeSource = source; <<<<<<< this.activeSourceHandle = null; this.acti...
<<<<<<< import {PrivilegeUtils} from "../../utils/PrivilegeUtils"; import {privileges} from "../../constants/privileges-types"; ======= import languages from '../../constants/languages' >>>>>>> <<<<<<< <MenuItemGroup title="Heimdall Project"> {PrivilegeUti...
<<<<<<< import React, {Component} from 'react' import {connect} from 'react-redux' import {bindActionCreators} from 'redux' import {clearResources, getAllResourcesByApi, remove, toggleModal} from '../actions/resources' ======= import React, { Component } from 'react' import { connect } from 'react-redux' import { bin...
<<<<<<< import session from './Session' ======= import navbar from './Navbar' >>>>>>> import session from './Session' import navbar from './Navbar' <<<<<<< scopes, session ======= scopes, navbar >>>>>>> scopes, session, navbar
<<<<<<< <Button id="cancelInterceptorTypeModal" key="back" onClick={this.handleCancel}>Cancel</Button>, <ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_INTERCEPTOR, privileges.PRIVILEGE_UPDATE_INTERCEPTOR]}> <But...
<<<<<<< <ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_USER]}> <FloatButton history={history} to="/users/new" label="Add new API" /> </ComponentAuthority> ======= <FloatButton idButton="addUser" history={history}...
<<<<<<< import {PrivilegeUtils} from "../../utils/PrivilegeUtils"; import {privileges} from "../../constants/privileges-types"; ======= import { isEmpty } from '../../utils/CommonUtils' import { toggleModal, resetResource, getResource, save, update } from '../../actions/resources' >>>>>>> import { isEmpty } from '.....
<<<<<<< initialValue: api.basePath, rules: [{ required: true, message: i18n.t('please_input_your_api_base_path') }] })(<Input />) ======= ...
<<<<<<< dispatch(getAllAccessTokens({offset: offset, limit: 10})) dispatch(sendNotification({ type: 'success', message: 'Access Token removed' })) ======= dispatch(getAllAccessTokens(offset)) dispatch(sendNotification({ type: 'success', message: i18n.t('access_token_rem...
<<<<<<< import Loading from '../ui/Loading'; import ColorUtils from "../../utils/ColorUtils"; import {PrivilegeUtils} from "../../utils/PrivilegeUtils"; import {privileges} from "../../constants/privileges-types"; import ComponentAuthority from "../ComponentAuthority"; ======= import i18n from "../../i18n/i18n" impo...
<<<<<<< import React, {Component} from 'react' // import FloatMenu from '../ui/FloatMenu' import {Form, Input, Row, Col, Checkbox, Switch, Tooltip, Button, Modal} from 'antd' import ComponentAuthority from "../ComponentAuthority"; import { privileges } from '../../constants/privileges-types' import {PrivilegeUtils} fro...
<<<<<<< initialValue: api.basePath, rules: [{required: true, message: 'Please input your api base path!'}] })(<Input disabled={!PrivilegeUtils.verifyPrivileges([privileges.PRIVILEG...
<<<<<<< rules: [{ required: true, message: i18n.t('please_input_operation_path') }] })(<Input required />) ======= rules: [{ required: true, message: 'Please input your api path!' }] ...
<<<<<<< 'default_plan_this_api': 'Plano padrão', 'swagger-editor': 'Editor do Swagger' ======= 'default_plan_this_api': 'Plano padrão', 'failed_to_get_privileges_this_user': 'Falha ao obter os privilégios do usuário!', 'session_expired': 'Sessão expirada', 'change_passw...
<<<<<<< this.account.addUnknownAssetData(); ======= // Search for user federation await this.handlers.searchFederation(this.account.accountId()); >>>>>>> this.account.addUnknownAssetData(); // Search for user federation ...
<<<<<<< <ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_DELETE_PLAN]}> <Tooltip title="Delete"> <Button id="deletePlan" className="card-button" type="danger" ghost icon="delete" size="large" shape="circle" disabled={!plan} onClick={pla...
<<<<<<< import ComponentAuthority from "../components/ComponentAuthority"; import {privileges} from "../constants/privileges-types"; ======= import ListEnvironments from '../components/environments/ListEnvironments' import { getAllEnvironments, remove, initLoading } from '../actions/environments' >>>>>>> import {pri...
<<<<<<< let columns = [{ title: 'Key', ======= const columns = [{ title: i18n.t('key'), >>>>>>> let columns = [{ title: i18n.t('key'), <<<<<<< }, { title: 'Value', ======= },{ title: i18n.t('value'), >>>>>>> }, { title: i18n.t('value'), <<<<<<< {getFieldDecorator(elementId, {...
<<<<<<< this.account.addUnknownAssetData(); // Search for user federation await this.handlers.searchFederation(this.account.accountId()); ======= >>>>>>> this.account.addUnknownAssetData();
<<<<<<< <Button key="back" onClick={this.handleCancel}>Cancel</Button>, <ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_INTERCEPTOR, privileges.PRIVILEGE_UPDATE_INTERCEPTOR]}> <Button key="submit" type="primary" ...
<<<<<<< dispatch(sendNotification({ type: 'success', message: 'Role removed' })) dispatch(finishLoading()) ======= dispatch(sendNotification({ type: 'success', message: i18n.t('role_removed') })) >>>>>>> dispatch(sendNotification({ type: 'success', message: i18n.t('rol...
<<<<<<< <Button key="back" onClick={this.handleCancel}>Cancel</Button>, <ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_OPERATION, privileges.PRIVILEGE_UPDATE_OPERATION]}> <Button key="submit" type="primary" loading={loading} onClick={t...
<<<<<<< import ComponentAuthority from "../components/ComponentAuthority"; import {privileges} from "../constants/privileges-types"; ======= import i18n from "../i18n/i18n" >>>>>>> <<<<<<< <ComponentAuthority privilegesAllowed={[privileges.PRIVILEGE_CREATE_MIDDLEWARE]}> <Card ...
<<<<<<< import React, {Component} from 'react' import {connect} from 'react-redux' ======= import React, { Component } from 'react' import { connect } from 'react-redux' //components import { Row, Form, Card, Input, Col, notification } from 'antd' >>>>>>> import React, { Component } from 'react' import { connect } ...
<<<<<<< displace = $menu.data('displace'), ======= onOpen = $menu.data('onOpen'), onClose = $menu.data('onClose'), >>>>>>> displace = $menu.data('displace'), onOpen = $menu.data('onOpen'), onClose = $menu.data('onClose'), <<<<<<< name : 'sid...
<<<<<<< import FAQPage from './pages/FAQPage' ======= import AuthPage from './pages/AuthPage' >>>>>>> import FAQPage from './pages/FAQPage' import AuthPage from './pages/AuthPage' <<<<<<< <Route path="/faqs" component={FAQPage} /> ...
<<<<<<< ======= import TopArea from 'components/TopArea'; import AppsGrid from 'components/AppsGrid'; import WhyBS from 'components/WhyBS'; import OurTechnology from 'components/OurTechnology'; import OurCommunity from 'components/OurCommunity'; import FundApp from 'components/FundApp'; import Mission from 'component...
<<<<<<< <div className="landing-page"> <Header links={bslinks}/> <TopArea links={bslinks}/> <AppsGrid links={bslinks}/> ======= <div> <TopArea/> <AppsGrid/> >>>>>>> <div> <TopArea links={data.site.siteMetadata.bslinks} /> <AppsGrid links={data.site.siteMetadata.bslinks} /> <<<<<...
<<<<<<< import React from 'react' import {Link} from 'react-router' import DocumentTitle from 'react-document-title' import YoutubeModal from 'react-youtube-modal' import Header from '../components/Header' import MailchimpForm from '../components/MailchimpForm' const HomePage = () => { const subscribeURL = '//blocks...
<<<<<<< { !specialHeader ? <div> <Header /> </div> : null } ======= {!specialHeader ? ( <div> {/* <Alert /> */} <Header /> </div> ) : null} >>>>>>> {!specialHeader ? ( <div> <Header /> ...
<<<<<<< it.skip('generates the correct command string when IO mappings are present', function () { const fc = new FFmpegCommand(new Map([['y'],])); let filterInput = new FilterNode('sine', { filterName: 'sine', args: [ { name: 'frequency', value: 620 }, { name: 'beep_factor', value...
<<<<<<< {` Wait participant: `} <div styleName="loaderHolder"> <InlineLoader /> </div> ======= <FormattedMessage id="partial291" defaultMessage="Wait participant: " /> <InlineLoader /> >>>>>>> ...
<<<<<<< user: { ethData, btcData, ghostData, tokensData, activeFiat }, ======= user: { ethData, btcData, tokensData, activeFiat, ...rest }, >>>>>>> user: { ethData, btcData, ghostData, tokensData, activeFiat, ...rest },
<<<<<<< Url = 'default' in Url ? Url['default'] : Url; Firebase$1 = 'default' in Firebase$1 ? Firebase$1['default'] : Firebase$1; Please = 'default' in Please ? Please['default'] : Please; ======= Firebase$1 = Firebase$1 && Firebase$1.hasOwnProperty('default') ? Firebase$1['default'] : Firebase$1; Url = Url && Url.ha...
<<<<<<< import NotifyBlock from './components/NotityBlock/NotifyBock' import NewButton from 'components/controls/NewButton/NewButton' import security from './components/NotityBlock/images/security.svg' import mail from './components/NotityBlock/images/mail.svg' import info from './components/NotityBlock/images/info-so...
<<<<<<< ======= @injectIntl >>>>>>> @injectIntl <<<<<<< let { swapHistory, txHistory, location, match:{ params: { fullName } } } = this.props const { currency, address, contractAddress, decimals, balance, isBalanceEmpty, } = this.state ======= let { swapHis...
<<<<<<< openScanCam: '', address: toAddress ? toAddress : '', amount: amount ? amount : '', minus: '', ======= usedAdminFee, openScanCam: "", address: toAddress ? toAddress : "", amount: amount ? amount : "", minus: "", >>>>>>> usedAdminFee, openScanC...
<<<<<<< // TODO to split data and view this component const SelectGroup = ({ dynamicFee, isToken, extendedControls, selectedValue, onSelect, dataTut, currencies, usd, placeholder, label, disabled, className, inputValueLink, tooltip, balance, error, id, type, idFee, tooltipAboutFee, haveAmount, ...props }) => ( <...
<<<<<<< user: { ethData, btcData, ltcData }, ======= user: { ethData, btcData, bchData }, >>>>>>> user: { ethData, btcData }, <<<<<<< ltcAddress: ltcData.address, ======= bchAddress: bchData.address, >>>>>>> <<<<<<< const { name, ethAddress, btcAddress, ltcAddress, history } = this.props...
<<<<<<< import { btc, ltc, constants, links } from 'helpers' ======= import { btc, bch, constants, links } from 'helpers' >>>>>>> import { btc, constants, links } from 'helpers' <<<<<<< ltcKey: '', ======= bchKey: '', >>>>>>> <<<<<<< isSubmittedLtc: false, ======= isSubmittedBch: false, >>>>>...
<<<<<<< ======= const sellToken = sell || "btc"; const buyToken = buy || (!isWidgetBuild ? "eth" : config.erc20token); >>>>>>>
<<<<<<< test: /\.(js|mjs|jsx|ts|tsx)$/, exclude: { test: [ /node_modules/, ], not: [ /libp2p/, /ipld/, /ipfs/, /pull-mplex/, /pull-stream-to-async-iterator/, /ipfs-unixfs-exporter/, /interface-datastore/, /multistream-sel...
<<<<<<< const widgetCurrencies = ['BTC', 'BTC (SMS-Protected)', 'BTC (Multisig)', 'ETH'] if (isWidgetBuild) { if (window.widgetERC20Tokens && Object.keys(window.widgetERC20Tokens).length) { // Multi token widget build Object.keys(window.widgetERC20Tokens).forEach(key => { widgetCurrencies.p...
<<<<<<< getReputation, getText, ======= >>>>>>> getReputation, getText,
<<<<<<< @injectIntl ======= >>>>>>> @injectIntl <<<<<<< let { swapHistory, txHistory, location, intl: { locale } } = this.props const { fullName, address, balance, currency, isBalanceEmpty } = this.state ======= let { swapHistory, txHistory, location, match:{ params: { fullName } } } = this.props ...
<<<<<<< user: { ethData, btcData, tokensData, nimData, ltcData /* usdtOmniData */ }, ======= user: { ethData, btcData, bchData, tokensData, nimData /* usdtOmniData */ }, >>>>>>> user: { ethData, btcData, tokensData, nimData /* usdtOmniData */ }, <<<<<<< currenciesData: [ethData, btcData, ltcData /* usdtOmni...
<<<<<<< migrate().finally(()=> setInterval(ipfsRoom.onload = () => { ======= setTimeout(() => { >>>>>>> migrate().finally(()=> setTimeout(() => { <<<<<<< }, 500)) ======= }, 1000) >>>>>>> }, 1000)
<<<<<<< nim, noxon: xrp, ======= >>>>>>> nim,
<<<<<<< user: { ethData, btcData, ltcData, /* xlmData, */ tokensData, nimData /* usdtOmniData */ }, ======= user: { ethData, btcData, /* xlmData, */ bchData, tokensData, nimData /* usdtOmniData */ }, >>>>>>> user: { ethData, btcData, /* xlmData, */ tokensData, nimData /* usdtOmniData */ }, <<<<<<< items: [e...
<<<<<<< pairFees: false, balances: false, } ======= balanceOnWalletsIsOk: false, }; constants.coinsWithDynamicFee.forEach( (item) => (this.state.estimatedFeeValues[item] = constants.minAmountOffer[item]) ); this.cacheDynamicFee = {}; >>>>>>> pairFees: false...
<<<<<<< user: { ethData, btcData, tokensData, nimData, ltcData /* usdtOmniData, nimData */ }, ======= user: { ethData, btcData, bchData, tokensData, nimData /* usdtOmniData, nimData */ }, >>>>>>> user: { ethData, btcData, tokensData, nimData /* usdtOmniData, nimData */ }, <<<<<<< items: [ethData, bt...
<<<<<<< import { request, constants } from 'helpers' ======= import { request, constants, api } from 'helpers' import abi from 'human-standard-token-abi' >>>>>>> import { request, constants, api } from 'helpers'
<<<<<<< ======= import { Comments } from '../lib/collections/comments'; import { getSetting, addStaticRoute } from './vulcan-lib'; >>>>>>> import { addStaticRoute } from './vulcan-lib';
<<<<<<< resolver: async (document, args, context: ResolverContext) => { const { currentUser } = context; return await Utils.getTableOfContentsData({document, version: null, currentUser, context}); ======= resolver: async (document, args, { currentUser }) => { try { return await Utils...
<<<<<<< const initGraphQL = () => { runCallbacks({name: 'graphql.init.before'}); const typeDefs = generateTypeDefs(); const executableSchema = makeExecutableSchema({ typeDefs, resolvers: GraphQLSchema.resolvers, schemaDirectives: GraphQLSchema.directives, ======= return { schema: graphQLSchema...
<<<<<<< async function handleSetShortformPost (newUser: DbUser, oldUser: DbUser) { ======= // When creating a new account, populate their A/B test group key from their // client ID, so that their A/B test groups will persist from when they were // logged out. async function setABTestKeyOnSignup (user) { Users.updat...
<<<<<<< addDefaultView: (view: ViewFunction<N>) => void addView: (viewName: string, view: ViewFunction<N>) => void defaultView: ViewFunction<N> //FIXME: This is actually nullable (but should just have a default) views: Record<string, ViewFunction<N>> getParameters: (terms: ViewTermsByCollectionName[N], apollo...
<<<<<<< const collection = getCollection(vote.collectionName); const document = await collection.findOne({_id: vote.documentId}); const user = await Users.findOne({_id: vote.userId}); ======= const collection = getCollection(vote.collectionName as VoteableCollectionName); const document = collection.findOne...
<<<<<<< import bowser from 'bowser'; ======= import Users, { UserLocation } from "./collection"; import bowser from 'bowser' import { getSetting, Utils } from '../../vulcan-lib'; import { Votes } from '../votes'; import { Comments } from '../comments' import { Posts } from '../posts' >>>>>>> import bowser from 'bows...
<<<<<<< const databaseIdObject = DatabaseMetadata.findOne({ name: "databaseId" }); const databaseId = databaseIdObject?.value || null; ======= const databaseIdObject = await DatabaseMetadata.findOne({ name: "databaseId" }); >>>>>>> const databaseIdObject = await DatabaseMetadata.findOne({ name: "databaseId" ...
<<<<<<< import { addUniversalFields, getDefaultResolvers, getDefaultMutations, schemaDefaultValue } from '../../collectionUtils' ======= import { addUniversalFields, getDefaultResolvers, schemaDefaultValue } from '../../collectionUtils' import { getDefaultMutations, MutationOptions } from '../../vulcan-core/default_m...
<<<<<<< import './2020-07-23-defaultWikiGrade.ts' import './2020-09-03-createWikiImportUsers.ts' ======= import './2020-07-23-defaultWikiGrade.ts' import './2020-09-03-defaultWikiOnly.ts' >>>>>>> import './2020-07-23-defaultWikiGrade.ts' import './2020-09-03-createWikiImportUsers.ts' import './2020-09-03-defaultWiki...
<<<<<<< if (newDocument.userId !== vote.userId) { void Users.update({_id: newDocument.userId}, {$inc: {"karma": vote.power}}); ======= if (newDocument.userId !== vote.userId && collectionsThatAffectKarma.includes(vote.collectionName)) { Users.update({_id: newDocument.userId}, {$inc: {"karma": vote.power}}...
<<<<<<< importComponent("ReviewVotingPage", () => require('../components/users/ReviewVotingPage.tsx')) importComponent("PasswordResetPage", () => require('../components/users/PasswordResetPage.tsx')) ======= >>>>>>> importComponent("PasswordResetPage", () => require('../components/users/PasswordResetPage.tsx'))
<<<<<<< import { ForwardedWhitelist } from './forwarded_whitelist'; import { Accounts } from '../platform/current/lib/meteorAccounts'; import { onServerConnect } from '../platform/current/server/meteorServerSideFns'; import { onStartup } from '../platform/current/lib/executionEnvironment'; ======= import { Meteor } f...
<<<<<<< interface TagsDefaultFragment { // fragment on Tags readonly name: string, readonly slug: string, readonly core: boolean, readonly suggestedAsFilter: boolean, readonly defaultOrder: number, readonly postCount: number, readonly createdAt: Date, readonly createdBy: string, readonly adminOnly: bo...
<<<<<<< ======= fragment commentWithContextFragment on Comment { _id parentCommentId topLevelCommentId contents { ...RevisionDisplay } postedAt userId user { ...UsersMinimumInfo } currentUserVotes{ ...VoteFragment } baseScore score } `); ...
<<<<<<< import Users from "../users/collection"; import { Posts } from '../posts/collection'; import { getSetting, Utils } from '../../vulcan-lib'; import { foreignKeyField, addFieldsDict, resolverOnlyField, denormalizedCountOfReferences, arrayOfForeignKeysField, denormalizedField, googleLocationToMongoLocation, access...
<<<<<<< const schema: SchemaType<DbVote> = { ======= const docIsTagRel = (currentUser, document) => { // TagRel votes are treated as public return document?.collectionName === "TagRels" } const schema = { >>>>>>> const docIsTagRel = (currentUser, document) => { // TagRel votes are treated as public return d...
<<<<<<< contents { _id htmlHighlight wordCount version } ======= >>>>>>>
<<<<<<< import './2020-04-28-tagDefaultOrder' import './2020-05-05-addRevisionCollectionName' ======= import './2020-04-28-tagDefaultOrder' import './2020-05-22-deletedNotifications' >>>>>>> import './2020-04-28-tagDefaultOrder' import './2020-05-05-addRevisionCollectionName' import './2020-05-22-deletedNotification...
<<<<<<< import * as React from 'react'; // just a generic object with children specified as props export interface IGenericProps { children?: React.ReactNode; } ======= import { ISlotProps } from '@uifabricshared/foundation-settings'; export type IUseStyling<TProps extends object, TSlotProps extends ISlotProps = ...
<<<<<<< import { RadioGroupTest } from './RadioGroupTest'; ======= import { PersonaTest } from './Persona/PersonaTest'; >>>>>>> import { RadioGroupTest } from './RadioGroupTest'; import { PersonaTest } from './Persona/PersonaTest'; <<<<<<< }, { name: 'RadioGroup Test', component: RadioGroupTest =======...
<<<<<<< export * from './Stack/index'; export * from './Text/index'; export * from './RadioGroup/index'; ======= export * from './Stack/index'; >>>>>>> export * from './Stack/index'; export * from './RadioGroup/index';
<<<<<<< export { addThemeRegistryListener, removeThemeRegistryListener, setTheme, getTheme, augmentPlatformTheme, createNativeThemeRegistry } from './Global'; export * from './INativeTheme'; ======= export { addThemeRegistryListener, removeThemeRegistryListener, setTheme, getTheme, augmentPlatformTheme } ...
<<<<<<< * Allow events to be dragged outside of the calendar */ @Input() allowDragOutside: boolean = false; /** * An array of day indexes (0 = sunday, 1 = monday etc) that indicate which days are weekends */ @Input() weekendDays: number[]; /** ======= >>>>>>> * An array of day indexes (0 = s...
<<<<<<< darkTheme: boolean; ======= tags: string[]; >>>>>>> darkTheme: boolean; tags: string[]; <<<<<<< label: route.data.label, darkTheme: route.data.darkTheme ======= tags: route.data.tags || [], label: route.data.label >>>>>>> label: route.data.label, da...
<<<<<<< snxJS: { SystemSettings, Synthetix }, ======= snxJS: { SynthetixState, Synthetix, Liquidations }, >>>>>>> snxJS: { SystemSettings, Synthetix, Liquidations, SynthetixState, contractSettings: { networkId }, }, <<<<<<< const [targetCRatio, currentCRatio, transferable, debtBalance] = re...
<<<<<<< import { AuthenticationHandler, Logger } from '../types' import { EVENT } from '../constants'; interface HttpAuthenticationHandlerSettings { // http(s) endpoint that will receive post requests endpointUrl: string // an array of http status codes that qualify as permitted permittedStatusCodes: number[] ...
<<<<<<< export type States = 'beforeData' | 'data' | 'tagOpen' | 'endTagOpen' | 'markupDeclaration' | 'commentStart' | 'comment' | 'commentStartDash' | 'commentEnd' | 'commentEndDash' | 'beforeAttributeName' | 'attributeName' | 'afterAttributeName' | 'selfClosingStartTag' | 'attributeValueDoubleQuoted' | 'attributeValu...
<<<<<<< import { Input, Layer, ActivationLayer } from '../ui/shapes/layer'; ======= import { Input, Layer } from '../ui/shapes/layer'; import { text } from 'd3'; >>>>>>> import { Input, Layer, ActivationLayer } from '../ui/shapes/layer'; import { text } from 'd3'; <<<<<<< defaults.set("MaxPooling2D", {poolSize: 2, ...
<<<<<<< public lineOfPython(): string { return `Concatenate()` } ======= public generateTfjsLayer(){ // Concatenate layers handle fan-in let parents = [] for (let parent of this.parents) { parents.push(parent.getTfjsLayer()) } this.tfjsLayer = ...
<<<<<<< import { loadStateIfPossible, storeNetworkInUrl } from "../model/save_state_url"; ======= import { pythonSkeleton } from "../model/skeleton"; >>>>>>> import { loadStateIfPossible, storeNetworkInUrl } from "../model/save_state_url"; import { pythonSkeleton } from "../model/skeleton"; <<<<<<< // graphToJs...
<<<<<<< paramBox: HTMLElement; ======= paramBox; >>>>>>> paramBox: HTMLElement; <<<<<<< let name = line.children[0].getAttribute('data-name'); if (line.children[1].className == "select") { let selectElement: HTMLSelectElement = <HTMLSelectElement>line.c...
<<<<<<< $scope.alert = { enable:false, content:'', type:'', hide: function(){ this.enable = false; }, show: function(){ this.enable = true; } }; ======= $scope.executionPredicat...
<<<<<<< $scope.stepExecutionList = data.jobExecution.stepExecutions; $scope.executionId = executionId; ======= $scope.stepExecutionList = stepList; >>>>>>> $scope.executionId = executionId; $scope.stepExecutionList = stepList;
<<<<<<< it('should connect to s3 because of configuration favorism', async () => { cluster3.maxLevel2Peers = 1 if (s1._server.conf.ws2p) s1._server.conf.ws2p.privateAccess = true if (s3._server.conf.ws2p) { s3._server.conf.ws2p.publicAccess = true s3._server.conf.ws2p.maxPublic = 1 } ====...
<<<<<<< QueryList, OnInit ======= QueryList, AfterContentInit >>>>>>> QueryList, OnInit, AfterContentInit <<<<<<< export class FormGroupComponent implements OnInit { ======= export class FormGroupComponent implements AfterContentInit { >>>>>>> export class FormGroupComponent implements OnInit, Afte...
<<<<<<< import {field, document, onetomany, manytoone, manytomany} from '../../decorators'; import {Strict} from '../../enums'; import {Types} from 'mongoose'; //@document({ name: 'students', strict: Strict.true }) ======= import {Types} from 'mongoose'; >>>>>>> import {Types} from 'mongoose'; import {Strict} f...