conflict_resolution
stringlengths
27
16k
<<<<<<< root: { '&&': { display: 'block' ======= select: { ...isolateMixin, position: 'relative', backgroundColor: theme.field.colors.default.background, '&:hover:not($disabled) $arrow': { color: theme.field.colors.default.text >>>>>>> root: { '&&': { display: 'block' ...
<<<<<<< if(o == null) o = cc.TRANSITION_ORIENTATION_UP_OVER; ======= if(o == null) o = cc.TRANSITION_ORIENTATION_UP_OVER; >>>>>>> if(o == null) o = cc.TRANSITION_ORIENTATION_UP_OVER; if(o == null) o = cc.TRANSITION_ORIENTATION_UP_OVER;
<<<<<<< _highlight: false, _touchEventCallback: null, ======= _focusEnabled: false, >>>>>>> _focusEnabled: false, _highlight: false, _touchEventCallback: null, <<<<<<< _updateContentSizeWithTextureSize: function(size){ }, _isAncestorsEnabled: function(){ }, _getAn...
<<<<<<< var glProgramState = cmd._glProgramState; if (_batchedInfo.texture !== texture || ======= var shader = cmd._shaderProgram; if (_batchBroken || _batchedInfo.texture !== texture || >>>>>>> var glProgramState = cmd._glProgramState; if (_batchBroken || ...
<<<<<<< /* if (this._isAccelerometerEnabled){ director.getAccelerometer().setDelegate(this); }*/ ======= if (this._isAccelerometerEnabled) { director.getAccelerometer().setDelegate(this); } >>>>>>> if (this._isAccelerometerEnabled) { d...
<<<<<<< that.button.className = "paused"; that.synth.stop(); ======= that.synth.pause(); >>>>>>> that.button.className = "paused"; that.synth.pause();
<<<<<<< var col = cc.LayerColor.layerWithColor(cc.ccc4(128, 128, 128, 255)); ======= this.time = 0; var col = cc.LayerColor.create(cc.ccc4(128, 128, 128, 255)); >>>>>>> var col = cc.LayerColor.create(cc.ccc4(128, 128, 128, 255)); <<<<<<< ctor:function () { var label = cc...
<<<<<<< _backGroundImageColor:null, ======= _className:"Layout", >>>>>>> _className:"Layout", _backGroundImageColor:null,
<<<<<<< cc.ParticleBatchNodeRenderCmdWebGL = function(node){ this._node = node; }; cc.ParticleBatchNodeRenderCmdWebGL.prototype.rendering = function(ctx){ var _t = this._node; if (_t.textureAtlas.totalQuads == 0) return; _t._shaderProgram.use(); _t._sha...
<<<<<<< cc.loadjs('../tests/Classes/tests/MenuTest/MenuTest.js'); cc.loadjs('../tests/Classes/tests/ActionsTest/ActionsTest.js'); ======= cc.loadjs('../tests/Classes/tests/SchedulerTest/SchedulerTest.js'); cc.loadjs('../tests/Classes/tests/ClickAndMoveTest/ClickAndMoveTest.js'); cc.loadjs('../tests/Classes/tests/Menu...
<<<<<<< if (!this.isVisible() || !this._isAncestorsVisible(this)) { return; } this._renderCmd.show(); ======= this._renderCmd._beginEditing(); >>>>>>> if (!this.isVisible() || !this._isAncestorsVisible(this)) { return; } this._renderCmd....
<<<<<<< * Point Sprite component * @Class * @Construct * @param {cc.Vertex2F} pos1 * @param {cc.Color} color1 * @param {Number} size1 */ cc.PointSprite = function (pos1, color1, size1) { this.pos = pos1 || new cc.Vertex2F(0, 0); this.color = color1 || cc.color(0, 0, 0, 0); this.size = size1 || 0; }; ...
<<<<<<< playState: { written: 0, total: Infinity }, ======= >>>>>>> <<<<<<< audioSettings: "{enviro}.audioSettings", model: { playState: "{enviro}.model.playState" } ======= ...
<<<<<<< flock.parse.bufferForDef(bufferDefs[i], bufferTarget, flock.environment); ======= // TODO: Hardcoded reference to the shared environment. flock.parse.bufferForDef(bufferDefs[i], bufferTarget, flock.enviro.shared); >>>>>>> // TODO: Hardcoded reference to the sha...
<<<<<<< _currTimeValue:null, ======= _watcherFun:null, _watcherSender:null, >>>>>>> <<<<<<< this._currTimeValue = new cc.timeval(); this._lastUpdate = new cc.timeval(); if (!cc.isAddedHiddenEvent) { ======= this._lastUpdate = Date.now(); if(!cc.isAddedHiddenEve...
<<<<<<< 'platform/zlib.min.js', 'platform/CCEGLViewProtocol.js', 'platform/CCEGLView.js', ======= 'platform/CCAccelerometer.js', 'platform/zlib.min.js', >>>>>>> 'platform/CCAccelerometer.js', 'platform/zlib.min.js', 'platform/CCEGLViewProtocol.js', 'p...
<<<<<<< cc.loadjs('../tests/Classes/tests/ProgressActionsTest/ProgressActionsTest.js'); cc.loadjs('../tests/Classes/tests/LayerTest/LayerTest.js'); ======= cc.loadjs('../tests/Classes/tests/ProgressActionsTest/ProgressActionsTest.js'); cc.loadjs('../tests/Classes/tests/SceneTest/SceneTest.js'); >>>>>>> cc.loadjs('.....
<<<<<<< ======= /* var move1 = cc.MoveBy.actionWithDuration(0.5, cc.ccp(0, 160)); var rotate1 = cc.RotateBy.actionWithDuration(2, 360); var scale1 = cc.ScaleBy.actionWithDuration(2, 5); var opacity1 = cc.FadeOut.actionWithDuration(2); var fadein1 = cc.FadeIn.actionWithD...
<<<<<<< ======= /** * Changes from the <code>initial</code> input to the <code>target</code> input * at the specified <code>time</code>. An optional <code>crossfade</code> duration * may be specified to linearly crossfade between the two inputs. * * Can be used to schedule sample-accurat...
<<<<<<< cc.loadjs('menu_nodes/CCdomMenu.js'); cc.loadjs('menu_nodes/CCdomMenuItem.js'); ======= cc.loadjs('menu_nodes/CCMenu.js'); cc.loadjs('../CocosDenshion/SimpleAudioEngine.js'); //cc.loadjs('menu_nodes/ccMenuItem.js'); >>>>>>> cc.loadjs('menu_nodes/CCdomMenu.js'); cc.loadjs('../CocosDenshion/SimpleAudioEngine.j...
<<<<<<< uplift: 0, ======= supplementalDamageBuff: 0, //enemyBuffCount: 0, enemyDebuffCount: 0, >>>>>>> uplift: 0, supplementalDamageBuff: 0, //enemyBuffCount: 0, enemyDebuffCount: 0, <<<<<<< personalOugiDamageLimitBuff: 0.0, personalUp...
<<<<<<< "通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP": { "en": "15% boost to all allies ATK based on how high character HP is (various)", "ja": "通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP", "zh": "通常攻撃を行わないが木之本桜の残りHPが多いほど味方全体の攻撃が大きくUP", }, "最大HPが15%減少 防御力が低いがイシュミールの残りHPが多いほど味方全体の攻撃が大きくUP": { ...
<<<<<<< var ougiDamage = module.exports.calcOugiDamage(summedAttack, totalSkillCoeff, criticalRatio, prof.enemyDefense, prof.defenseDebuff, enemyResistance, totals[key]["ougiRatio"], ougiDamageUP, damageUP, ougiDamageLimit); ======= var ougiDamage = module.exports.calcOugiDamage(summedAttack, totalSki...
<<<<<<< <li className="list-group-item list-group-item-info">2016/10/01: PC版レイアウトの調整 (縦分割レイアウトの撤廃)</li> ======= <li className="list-group-item list-group-item-info">2016/10/14: 武器テンプレートにマルメターノを追加/ブラックアックス解放に対応/召喚石加護量に66%を追加(蘭子用)</li> >>>>>>> <li className="list-group...
<<<<<<< <title>GitCodeShare</title> <link rel="shortcut icon" href="/static/gchFavicon.ico" /> <link rel="stylesheet" href="/_next/static/style.css" /> ======= <link rel="shortcut icon" href="/static/favicon.ico" /> >>>>>>> <title>GitCodeShare</title> <link...
<<<<<<< const describe = (unit, cb) => tape(unit, assert => { const end = assert.end.bind(assert); const result = cb(description => ({ assert: ({ actual, expected, given, should = description }) => assert.same( actual, expected, `Given ${ given }: should ${ should }` ), // We ca...
<<<<<<< const TOGGLE_INFO_WINDOW = 'TOGGLE_INFO_WINDOW'; const SERVICES_FETCH = 'bananas'; const PODS_FETCH = 'apples'; ======= const DISPLAY_NODE_INFO = 'DISPLAY_NODE_INFO'; const HIDE_NODE_INFO = 'HIDE_NODE_INFO'; >>>>>>> const DISPLAY_NODE_INFO = 'DISPLAY_NODE_INFO'; const HIDE_NODE_INFO = 'HIDE_NODE_INFO'; const...
<<<<<<< handleInput: function() {\n\ ======= handleChange: React.autoBind(function() {\n\ >>>>>>> handleChange: function() {\n\
<<<<<<< self.sendSliceCommand(newFilename, group); } ======= self.sendSliceCommand(newFilename); }, error: function(jqXHR, textStatus) { new PNotify({title: "Slicing failed", text: textStatus, type: "error", hide: false}); ...
<<<<<<< , "you finished a hard problem and learned something new. doesn't it feel great?" , "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn" , "Never leave house without your towel." , "If 42 doesn't answer your question, try a prime number." , "i'm pretty new to this." ...
<<<<<<< , "you finished a hard problem and learned something new. doesn't it feel great?" , "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn" , "Never leave house without your towel." , "If 42 doesn't answer your question, try a prime number." , "i'm pretty new to this." ...
<<<<<<< , "you finished a hard problem and learned something new. doesn't it feel great?" , "\"Nothing is impossible, the word itself says \'I\'m possible!\'\" - Audrey Hepburn" , "Never leave house without your towel." , "If 42 doesn't answer your question, try a prime number." , "i'm pretty new to this." ...
<<<<<<< , "If you can see this message it means you got it working and that's something to celebrate! ['hip','hip']!" , "you are the best around." , "computers are super hard, but you can defeat them!" , "it's okay to need a break, everyone needs one!" , "you got this." , "whoah you're pretty good at this."...
<<<<<<< var changeEvent = $.Event('change') changeEvent.initiator = 'tokenfield' this.$element.val( this.getTokensList() ).trigger( changeEvent ) ======= if (triggerChange) { this.$element.val( this.getTokensList() ).trigger('change') } >>>>>>> var changeEvent = $.Event('c...
<<<<<<< copy: { main: { files: [ {expand: true, src: ['app/package.manifest'], dest: '<%= dest %>', flatten: true}, {expand: true, src: ['app/views/archetype.html'], dest: '<%= dest %>/views', flatten: true} ] }, nuget_prepare: { files: [ {expand: tr...
<<<<<<< import Radio from '../packages/Radio/index.js' import RadioGroup from '../packages/RadioGroup/index.js' import Checkbox from '../packages/Checkbox/index.js' import CheckboxGroup from '../packages/CheckboxGroup/index.js' import ImagePreview from '../packages/ImagePreview/index.js' ======= import Tooltip from '...
<<<<<<< Vue.component(Popup.name, Popup) ======= Vue.component(Swipe.name, Swipe) Vue.component(SwipeItem.name, SwipeItem) Vue.component(Switch.name, Switch) >>>>>>> Vue.component(Popup.name, Popup) Vue.component(Swipe.name, Swipe) Vue.component(SwipeItem.name, SwipeItem) Vue.component(Switch.name, S...
<<<<<<< import { getIn, setDifference } from '../../common/util' ======= import { getIn, promiseReduce, promiseFirst } from '../../common/util' >>>>>>> import { getIn, setDifference, promiseReduce, promiseFirst } from '../../common/util' <<<<<<< describe('setDifference', () => { it('should calculate the diffe...
<<<<<<< if (this.isOpen()) { // check if modal is bigger than screen height this.checkOverflow(); } ======= return this; >>>>>>> if (this.isOpen()) { // check if modal is bigger than screen height this.checkOverflow(); } ...
<<<<<<< this.pool = this.mysql.createPool(this.config); this.pool.getConnection((err) => { if (err) { this.logger.emergency('Failed to open mysql connection', this.config); } return cb(err); }); ======= // Create one connection this.pool.getConnection((err) => { return cb(err); }); >>>>>>> // Cre...
<<<<<<< await sr.deposit({ value: deposit }); let known_deposit = await rhub.balances(sr.address); assert.equal(deposit, known_deposit); ======= await sr.deposit({value: deposit}); // let known_deposit = await rhub.balances(sr.address); // assert.ok(known_deposit>= depo...
<<<<<<< if(errorCode instanceof Error) { debug("Error occurred with trace:", errorCode.stack); } if (typeof this.options.errorCallback == 'function') { ======= if (notification && typeof notification.errorCallback == 'function' ) { notification.errorCallback(errorCode); } else if (typeof this.options.errorCa...
<<<<<<< invariant(component != null, "Cannot load component: %s", componentPath); render(React.createElement(component, props), callback); ======= invariant( component != null, 'Cannot load component: %s', componentPath ) render( React.createElement(component, props), function (err, ht...
<<<<<<< case "url": if(context.options && context.options.rewriteUrl) { ======= case 'url': if(context.options.rewriteUrl) { >>>>>>> case 'url': if(context.options && context.options.rewriteUrl) { <<<<<<< css.walkRules(function(rule) { if(rule.parent.type === "atrule" && /key...
<<<<<<< export const LOGIN_ERROR = "LOGIN_ERROR"; export const LOGOUT_ERROR = "LOGOUT_ERROR"; export const PROGRESS = "LOGOUT_ERROR"; export const ACTION_REPOSITORIES_LIST = "ACTION_REPOSITORIES_LIST"; export const ACTION_LIST_ERROR = "ACTION_LIST_ERROR"; export const ACTION_LIST_SUCCESS = "ACTION_LIST_SUCCESS"; ===...
<<<<<<< export const ACTION_LIST_SUCCESS = "ACTION_LIST_ERROR"; export const ACTION_README = "ACTION_README"; export const ACTION_README_SUCCESS = "ACTION_README_SUCCESS"; export const ACTION_README_ERROR = "ACTION_README_ERROR"; ======= export const ACTION_LIST_SUCCESS = "ACTION_LIST_SUCCESS"; >>>>>>> export const...
<<<<<<< persistStore(store, {storage: AsyncStorage, blacklist: []}); return {...store, runSaga: [sagaMiddleware.run(loginSaga.loginFlow), sagaMiddleware.run(listSaga.listFlow)]}; ======= persistStore(store, {storage: AsyncStorage, blacklist: ['root']}); return {...store, runSaga: sagaMiddleware.run(loginSaga....
<<<<<<< ...Strong.propTypes, appearance: PropTypes.oneOf(Object.keys(FillAppearances.default)) .isRequired, ======= ...Text.propTypes, appearance: PropTypes.oneOf(Object.keys(FillAppearances.default)).isRequired >>>>>>> ...Strong.propTypes, appearance: PropTypes.oneOf(Object.keys(FillAp...
<<<<<<< <h1>Comparaison des différents régimes de cotisation</h1> <p> Calcul du{' '} <strong> revenu du travailleur indépendant ou dirigeant d'entreprise </strong> , en fonction de son choix de régime social. Nous faisons les hypothèses suivantes : tout le chiffre d'affaires sert à payer le dirig...
<<<<<<< var _ = require('underscore'), Config = require('root/config'), App = require('core/app'), RegionManager = require( 'core/region-manager' ), Stats = require('core/stats'), ThemeApp = require('core/theme-app'), Hooks ...
<<<<<<< export Upload from './Upload'; export Tab from './Tab'; ======= export Upload from './Upload'; export Message from './Message'; >>>>>>> export Upload from './Upload'; export Tab from './Tab'; export Message from './Message';
<<<<<<< // { // key: 'popover', // name: '气泡卡片', // module: () => import('@/components/popover/popover.md'), // style: false, // }, { key: 'popconfirm', name: '气泡确认框', module: () => import('@/components/popconfirm/demo.md'), style: true, ...
<<<<<<< const iter = require('iter-tools/iter') const asyncIter = require('iter-tools/async-iter') const tee = require('iter-tools/tee') const asyncTee = require('iter-tools/async-tee') iter.silence() asyncIter.silence() tee.silence() asyncTee.silence() ======= >>>>>>> const tee = require('iter-tools/tee') const as...
<<<<<<< mod.Stack = Sk.misceval.buildClass(mod, function($gbl, $loc) { $loc.__init__ = new Sk.builtin.func(function(self) { self.stack = []; // Make a new attribute named 'int_value' Sk.abstr.sattr(self, 'int_value', Sk.ffi.remapToPy(5), true); var aChild = Sk...
<<<<<<< <div> <AutoSizer disableHeight> <FlexTable ref='Table' headerClassName={styles.headerColumn} headerHeight={headerHeight} height={height} noRowsRenderer={this._noRowsRenderer} rowClassName={::this._r...
<<<<<<< getOverscanIndices, ======= computeCellMetadataAndUpdateScrollOffsetHelper, createCallbackMemoizer, >>>>>>> computeCellMetadataAndUpdateScrollOffsetHelper, createCallbackMemoizer, getOverscanIndices,
<<<<<<< import Grid from '../Grid' ======= import { computeCellMetadataAndUpdateScrollOffsetHelper, createCallbackMemoizer, getOverscanIndices, getUpdatedOffsetForIndex, getVisibleCellIndices, initCellMetadata, updateScrollIndexHelper } from '../utils' import cn from 'classnames' import raf from 'raf' ...
<<<<<<< getOverscanIndices, ======= computeCellMetadataAndUpdateScrollOffsetHelper, createCallbackMemoizer, >>>>>>> computeCellMetadataAndUpdateScrollOffsetHelper, createCallbackMemoizer, getOverscanIndices, <<<<<<< onRowsRendered: PropTypes.func, /** * Number of rows to render above/below ...
<<<<<<< // Tracking web-analytics // this records data about users hitting cocalc and cocalc-related websites // this table is 100% back-end only schema.analytics = { primary_key: ["token"], pg_indexes: ["token", "time"], durability: "soft", fields: { token: { type: "uuid" }, time: { typ...
<<<<<<< * Fluid Infusion v2.0 ======= * Fluid Infusion v3.0.0 >>>>>>> * Fluid Infusion v3.0.0 <<<<<<< fluid.log("Clearing cache for component " + defaultName + " with gradeNames ", searchGrades); ======= if (fluid.passLogLevel(fluid.logLevel.TRACE)) { fluid.l...
<<<<<<< ======= >>>>>>> <<<<<<< var currentExpressionDataSet; ======= var pcaMsg; var highlightIndex = []; >>>>>>> var currentExpressionDataSet; var pcaMsg; var highlightIndex = []; <<<<<<< requestExpressionDataSetNames(); }else{ ======= }else >>>>>>> requestExpressionDataS...
<<<<<<< Client.prototype.sendStat = function (stat, value, type, sampleRate, tags, callback) { var message = this.prefix + stat + this.suffix + ':' + value + '|' + type; ======= Client.prototype.send = function (stat, value, type, sampleRate, tags, callback) { var message = this.prefix + stat + this.suffix + ':' ...
<<<<<<< assert.equal(metrics, `test:42|${statFunction.unit}|#gtag:gvalue1,gtag:gvalue2,foo,bar${metricsEnd}`); ======= assert.strictEqual(metrics, `test:42|${statFunction.unit}|#foo,bar${metricsEnd}`); >>>>>>> assert.strictEqual(metrics, `test:42|${statFunction.unit}|#gtag:g...
<<<<<<< children: PropTypes.object.isRequired, isDisabled: PropTypes.bool, hideArrows: PropTypes.bool ======= children: PropTypes.object.isRequired, isDisabled: PropTypes.bool, hideArrows: PropTypes.bool }; const defaultMenuStyle = { display: 'flex', alignItems: 'center', userSelect: 'none' }; con...
<<<<<<< const {route_args, common_args} = require('../common.arguments'); const {CONFIG_KEYS, VERSIONS} = require('../../../constants'); const resource_args = require('./careplan.arguments'); ======= const { route_args, common_args, write_args } = require('../common.arguments'); const { read_scopes, write_scopes } = ...
<<<<<<< const {route_args, common_args} = require('../common.arguments'); const {CONFIG_KEYS, VERSIONS} = require('../../../constants'); const resource_args = require('./goal.arguments'); ======= const { route_args, common_args, write_args } = require('../common.arguments'); const { read_scopes, write_scopes } = requ...
<<<<<<< /*! Flocking 0.1.0 (November 12, 2014), Copyright 2014 Colin Clark | flockingjs.org */ ======= /*! Flocking 0.1.0 (November 26, 2014), Copyright 2014 Colin Clark | flockingjs.org */ >>>>>>> /*! Flocking 0.1.0 (November 26, 2014), Copyright 2014 Colin Clark | flockingjs.org */ <<<<<<< ======= /** ...
<<<<<<< const {route_args, common_args} = require('../common.arguments'); const {CONFIG_KEYS, VERSIONS} = require('../../../constants'); const resource_args = require('./condition.arguments'); ======= const { route_args, common_args, write_args } = require('../common.arguments'); const { read_scopes, write_scopes } =...
<<<<<<< const {route_args, common_args} = require('../common.arguments'); const {CONFIG_KEYS, VERSIONS} = require('../../../constants'); const resource_args = require('./allergyintolerance.arguments'); ======= const { route_args, common_args, write_args } = require('../common.arguments'); const { read_scopes, write_s...
<<<<<<< numInputBuses: 2, numBuses: 6, // By default, two output buses, two input buses, and two interconnect buses. ======= numBuses: 8, >>>>>>> numInputBuses: 2, numBuses: 8, <<<<<<< that.play = function (dur) { dur = dur === undefin...
<<<<<<< const {route_args, common_args} = require('../common.arguments'); const {CONFIG_KEYS, VERSIONS} = require('../../../constants'); const resource_args = require('./observation.arguments'); ======= const { route_args, common_args, write_args } = require('../common.arguments'); const { read_scopes, write_scopes }...
<<<<<<< // Validate auth validator config.auth = loadAuthValidator('auth', config.auth); // Validate profiles let profileKeys = Object.keys(config.profiles); let hasValidProfileConfiguration = profileKeys.every(profileKey => { return loadProfile(profileKey, config.profiles[profileKey]); ======= // Vali...
<<<<<<< module.exports = new Rule('Do not use u element', 'Please remove the u element', function(dom) { 'use strict'; dom.$('u').each(function(index, item){ throw dom.$(item).parent().html(); }); ======= exports.uElement = new Rule({ name: 'Do not use u element', message: 'Please remove the u elemen...
<<<<<<< module.exports = new Rule('No blink or marquee elements', 'You cant use blink or marquee elements', function(dom) { 'use strict'; ======= exports.blinkElement = new Rule({ name: 'No blink or marquee elements', message: 'You cant use blink or marquee elements', ruleUrl: 'http://oaa-accessibility.org...
<<<<<<< module.exports = new Rule('Do not use i element', 'Please remove the i element', function(dom) { 'use strict'; dom.$('i').each(function(index, item){ throw dom.$(item).parent().html(); }); ======= exports.iElement = new Rule({ name: 'Do not use i element', message: 'Please remove the i elemen...
<<<<<<< module.exports = new Rule( 'All pages should have lang attr in html tag', 'Please add the lang attribute to the html tag', function(dom) { ======= exports.htmlLang = new Rule({ name: 'All pages should have lang attr in html tag', message: 'Please add the lang attribute to the html tag', ruleUrl...
<<<<<<< module.exports = new Rule('Frame must have title attr', 'Please add title attribute to this frame', function(dom) { 'use strict'; ======= exports.frameTitle = new Rule({ name: 'Frame must have title attr', message: 'Please add title attribute to this frame', ruleurl: 'http://oaa-accessibility.org/r...
<<<<<<< 'input-github-webhook': '../lib/plugins/input/webhooks/github.js', ======= 'azure-event-hub': '../lib/plugins/input/azure-event-hub.js', >>>>>>> 'input-github-webhook': '../lib/plugins/input/webhooks/github.js', 'azure-event-hub': '../lib/plugins/input/azure-event-hub.js',
<<<<<<< let externalHelpersWhitelist = null; if ( options.externalHelpersWhitelist ) externalHelpersWhitelist = options.externalHelpersWhitelist; delete options.externalHelpersWhitelist; ======= let warn = msg => console.warn(msg); // eslint-disable-line no-console >>>>>>> let externalHelpersWhitelist = nul...
<<<<<<< <ColoredChange direction={ direction }> { formatNumber(this.store.totalChange, 'USD', { directionSymbol: true }) } </ColoredChange> ======= <PriceChange direction={ direction } trigger={ this.store.totalChange }> ...
<<<<<<< const BaseProcess = require('../../lib/mapper').Process; ======= const bpmnModdle = new BpmnModdle({ camunda: require('camunda-bpmn-moddle/resources/camunda') }); const ServiceTask = mapper('bpmn:ServiceTask'); >>>>>>> const BaseProcess = require('../../lib/mapper').Process; const bpmnModdle = new BpmnModd...
<<<<<<< expect(instance.variables.taskInput.recurring.taskInput.recurringChild.result[0]).to.equal(10); testHelpers.expectNoLingeringListenersOnDefinition(instance); ======= expect(instance.variables.taskInput.recurring.taskInput.recurringChild[0]).to.equal(10); testHel...
<<<<<<< it("can retrieve spreadsheet row which conforms to query", function(done) { GoogleSpreadsheets({ key: "0ApDvWFF4RPZBdEFucnJya1hxVG9wZzhJQWZUWkpfekE" }, function(err, spreadsheet) { if(err) return done(err); spreadsheet.worksheets[0].rows({ sq: "hello>1" }, function(err, result) { resu...
<<<<<<< ======= /** * Gets the value of the ugen at the specified path. * * @param {String} path the ugen's path within the synth graph * @return {Number|UGen} a scalar value in the case of a value ugen, otherwise the ugen itself */ that.get = function (p...
<<<<<<< chans = settings.chans, chan, i, samp; // If there are no nodes providing samples, write out silence. if (evaluator.nodes.length < 1) { for (chan = 0; chan < chans; chan++) { flock.genera...
<<<<<<< }, "undefined" == typeof window && "undefined" != typeof module && module.exports && (module.exports = a); var V = (m = m || require("infusion")).registerNamespace("flock"); ======= }, "undefined" == typeof window && "undefined" != typeof module && module.exports && (module.exports = r); var D...
<<<<<<< all: [ "flocking/*.js", "demos/**/*.js", "tests/**/*.js", "!**/third-party/**", // TODO: Temporary until all playground files are ready for linting. "!demos/interactive/demos/*.js" ], ======...
<<<<<<< 'use strict'; import {Rx} from '@cycle/core'; ======= import Cycle from 'cyclejs'; >>>>>>> import {Rx} from '@cycle/core';
<<<<<<< scope.lazyImage.removeImage(); ======= lazyImage.removeImage(); if(!!$rootScope.lazyImgRefreshEvents) { for (var i=0; i< $rootScope.lazyImgRefreshEvents.length; i++) { $rootScope.lazyImgRefreshEvents[i](); } $rootScope.lazyImgRefr...
<<<<<<< ======= jQuery.fn.numberInput = function(increment) { this.each(function() { var $self = $(this); $self.addClass("number-combo-input"); var height = $self.outerHeight() / 2; var $dom = $('<span>').attr({ 'class': 'number-combo' }) .append($('<a>').at...
<<<<<<< ======= // TODO: what happens if this function is called while // the site is already being built? >>>>>>> <<<<<<< if (err) return callback('Error: Default template missing'); registerTemplates(site, function (err) { var newRoot = new Page(site, null, '', null, function(err) { site.modified = ...
<<<<<<< Ideogram.prototype.rotateAndToggleDisplay = function(chromosome) { /* * Do nothing if taxId not defined. But it should be defined. * To fix that bug we should have a way to find chromosome set number. */ if (! this.config.taxid) { return; ======= Ideogram.prototype.rotateAndToggleDisplay = ...
<<<<<<< var chokidar = require('chokidar'); ======= var jsYaml = require('js-yaml'); >>>>>>> var jsYaml = require('js-yaml'); var chokidar = require('chokidar'); <<<<<<< ======= // Aggregate information about APIs. var apis = []; program.args.forEach(function(argument) { // Try to resolve the argument: ...
<<<<<<< adblocker.isReady().then(() => adblocker.action('addWhiteListCheck', url => isWhitelisted({ sourceUrl: url }))); ======= adblocker.isReady().then(() => Promise.all([ adblocker.action('removePipelineStep', 'checkWhitelist'), adblocker.action('addPipelineStep', { name: 'checkGhosteryWhitelist', ...
<<<<<<< checkForRelativePaths: state.settings.getIn(['mjml', 'checkForRelativePaths']), ======= preventAutoSave: state.settings.getIn(['editor', 'preventAutoSave']), >>>>>>> checkForRelativePaths: state.settings.getIn(['mjml', 'checkForRelativePaths']), preventAutoSave: state.settings.getIn(['editor'...
<<<<<<< const checkForRelativePaths = settings.getIn(['mjml', 'checkForRelativePaths'], false) ======= const preventAutoSave = settings.getIn(['editor', 'preventAutoSave'], false) >>>>>>> const checkForRelativePaths = settings.getIn(['mjml', 'checkForRelativePaths'], false) const preventAutoSave = se...
<<<<<<< appState: [], toggleTool: false, clickData: [], schema: '' ======= appState: [] >>>>>>> appState: [], schema: '' <<<<<<< fetchSchemaFromGraphQLServer() { fetch("http://localhost:4000/graphql", { method: "POST", headers: { "Content-Type": "applicati...
<<<<<<< ======= // Map the settings to the renderConfig object. // @see: main.js settings init default for explanations and default values. function setRenderSettings() { renderConfig.flattenResolution = app.settings.v.flatten; renderConfig.lineEndPreShutoff = app.settings.v.shutoff; renderConfig.startWait = a...
<<<<<<< segment = path = addselect = null; ======= segment = path = selectChange = null; console.log('shift?', event.modifiers.shift); >>>>>>> segment = path = selectChange = null; <<<<<<< if (paper.selectRect !== null) paper.selectRect.remove(); ======= console.log('INIT Selection'); ...
<<<<<<< // window.addEventListener('run-traverser', () => { // console.log('run the traverser!') // setHook(); // reactGlobalHook.onCommitFiberRoot(); // }) ======= window.addEventListener('run-traverser', () => { console.log('run the traverser!') setHook(); reactGlobalHook.onComm...