conflict_resolution
stringlengths
27
16k
<<<<<<< 'views/Filter/filterView', ======= 'views/Filter/FilterView', 'helpers/eventsBinder', >>>>>>> 'views/Filter/filterView', 'helpers/eventsBinder',
<<<<<<< } }, department: { $addToSet: { _id: '$department._id', name: { $ifNull: ['$department.departmentName', 'None'] ======= ...
<<<<<<< var CONSTANTS = require('../constants/mainConstants.js'); ======= var objectId = mongoose.Types.ObjectId; var validatorEmployee = require('../helpers/validator'); var Payroll = require('../handlers/payroll'); var payrollHandler = new Payroll(models); var ids = ['52203e707d4dba881300000...
<<<<<<< var productCategoriesRouter = require('./productCategories')(models); ======= var filterRouter = require('./filter')(models); >>>>>>> var filterRouter = require('./filter')(models); var productCategoriesRouter = require('./productCategories')(models);
<<<<<<< actionType: null, //Content, Edit, Create template: _.template(ContentTopBarTemplate), events:{ "click a.changeContentView": 'changeContentViewType', "click ul.changeContentIndex a": 'changeItemIndex', "click #top-bar-delete...
<<<<<<< var PayRoll = models.get(lastDB, 'PayRoll', PayRollSchema); ======= var startDate; var endDate; var dateRangeObject; function dateRange() { "use strict"; var weeksArr = []; var startWeek = moment().isoWeek() - 1; var year...
<<<<<<< 'click .sendObject': 'goToPreview', 'click .tabItem' : 'changeTab', ======= 'click .stageBtn': 'goToPreview', 'click ._importListTabs' : 'changeTab', >>>>>>> 'click .stageBtn': 'goToPreview', 'click ._importListTabs' : 'changeTab', <<<<...
<<<<<<< if (xhr.status === 403) { App.render({ type: 'error', message: 'No access' }); } else { App.render({ ...
<<<<<<< events: { 'click .stageSelect' : 'showNewSelect', 'click .list tbody td:not(.notForm)': 'goToEditDialog', 'click .newSelectList li' : 'chooseOption' }, chooseOption: function (e) { var self = this; v...
<<<<<<< //We verify that rows were added to a subset, then submit the search parameters to the sampleExplorer controller. function validateHeatMapsSample(completedFunction) { //We need to generate a JSON object that has all the subsets. jsonDataToPass = buildSubsetJSON(); //Exit is we found no records in the subse...
<<<<<<< 'views/selectView/selectView', 'moment' ======= 'views/selectView/selectView', 'constants', 'moment' >>>>>>> 'views/selectView/selectView', 'constants', 'moment' <<<<<<< function (CreateTemplate, EmployeeModel, common, populate, attachView,...
<<<<<<< showDialog: function (orderId) { var self = this; ======= /*showDialog: function (orderId) { >>>>>>> showDialog: function (orderId) { var self = this; <<<<<<< var self = this; ======= e.preventDefault(); var self = this; ...
<<<<<<< listItemView : listItemView, contentCollection : contentCollection, FilterView : FilterView, ======= ListItemView : ListItemView, ContentCollection : ContentCollection, filterView : FilterView, >>>>>>>...
<<<<<<< 'dataService', 'moment' ======= 'dataService', 'common' >>>>>>> 'dataService', 'moment' 'common' <<<<<<< function (generateTemplate, wTrackPerEmployeeTemplate, wTrackPerEmployee, currentModel, currentCollection, populate, dataService, moment) { ==...
<<<<<<< JOBSDASHBOARD : 'jobsDashboard', PAYROLLPAYMENTS : 'PayrollPayments', ======= JOBSDASHBOARD : 'jobsDashboard', PRODUCTSETTINGS : "productSettings", >>>>>>> JOBSDASHBOARD : 'jobsDashboard', PAYROLLPAYMENTS : 'PayrollPayments', PRODUCTSE...
<<<<<<< function checkDb(db) { var validDbs = ["weTrack", "production", "development", "maxdb"]; return validDbs.indexOf(db) !== -1; } ======= >>>>>>> <<<<<<< var moduleId; var isWtrack; var Invoice; var date; ======= var moduleId = 64; var...
<<<<<<< 'views/Filter/filterView', ======= 'views/Filter/FilterView', 'helpers/eventsBinder', >>>>>>> 'views/Filter/filterView', 'helpers/eventsBinder',
<<<<<<< // Filter custom event listen ------begin FilterView.bind('filter', function(filter) { self.showFilteredPage(filter, self); }); FilterView.bind('defaultFilter', function () { self.showFilteredPage({}, self); ...
<<<<<<< 'helpers'], function (Backbone, $, _, ProjectsFormTemplate, DetailsTemplate, ProformRevenueTemplate, jobsWTracksTemplate, invoiceStats, proformaStats, ReportView, ...
<<<<<<< //for default filter && defaultViewType if (option && option.contentType && App.filtersObject.savedFilters[option.contentType]) { savedFilter = App.filtersObject.savedFilters[option.contentType]; ======= // for default filter && defaultViewType if (option && option....
<<<<<<< 'click .stageBtn' : 'goToPreview' }, resetForm: function () { this.render(this.data); ======= 'click .stageBtn': 'goToPreview', 'click .tabItem' : 'changeTab', 'click .cleanButton' : 'clean' >>>>>>> 'click .stageBtn':...
<<<<<<< import Name from './Name' import EditorArea from './EditorArea' ======= import Editor from './Editor' import Preview from './Preview' import Toolbar from './toolbar/Toolbar' >>>>>>> import EditorArea from './EditorArea' <<<<<<< ======= let editorContainer if (type === 'richtext') { editorCo...
<<<<<<< .alias('g', 'smplayer').describe('g', 'autoplay in smplayer*').boolean('g') ======= .describe('mpchc', 'autoplay in MPC-HC player*').boolean('boolean') >>>>>>> .alias('g', 'smplayer').describe('g', 'autoplay in smplayer*').boolean('g') .describe('mpchc', 'autoplay in MPC-HC player*').boolean('boolean...
<<<<<<< if (params.faceDetection === undefined) params.faceDetection = {}; if (params.faceDetection.workSize === undefined) params.faceDetection.workSize = 160; if (params.faceDetection.minScale === undefined) params.faceDetection.minScale = 2; if (params.faceDetection.scaleFactor === undefined) params.faceDet...
<<<<<<< actions: [{ type: 'modify', path: '../../app/routes.js', pattern: /(\s{\n\s{6}path: '\*',)/g, templateFile: './route/route.hbs', }], ======= actions: data => { const actions = []; if (reducerExists(data.component)) { actions.push({ type: 'modify', path: '../...
<<<<<<< return message.replace(/\{0\}/gi, ko.utils.unwrapObservable(params)); ======= } return message.replace(/\{0\}/gi, params); >>>>>>> } return message.replace(/\{0\}/gi, ko.utils.unwrapObservable(params));
<<<<<<< //#endregion //#region setRules Tests module("setRules Tests"); test("setRules applies rules to all properties", function () { var definition = { property1: { required: true, min: 10, max: 99, ignoredDefinition: { required: true } }, child: { property2: { pattern: { params: "^[a...
<<<<<<< var dataSourcesByType = { 'image': [{source: 'flickr', 'display': 'Flickr'}, {source: 'imgur', display: 'Imgur'}], 'viz': [{source: 'oec', display: 'Observatory of Economic Complexity'}], 'gif': [{source: 'giphy', display: 'Giphy'}], 'video': [{source: 'youtube', display: 'Youtube'}], // 'map': [{sour...
<<<<<<< headerImageUrl: function() { return '//' + Meteor.settings["public"].AWS_BUCKET + '.s3.amazonaws.com/header-images/' + this.headerImage; }, authorUsername: function() { return this.userPathSegment ======= headerImageUrl: headerImageUrl, author: function(){ return Meteor.users.findOne(thi...
<<<<<<< uiModel.goToLoadingState(); return from(loadGltf(model.mainFile, view, model.additionalFiles).then( (gltf) => { ======= return from(resourceLoader.loadGltf(model.mainFile, model.additionalFiles).then( (gltf) => { >>>>>>> uiModel.goToLoadingState(); ret...
<<<<<<< 'environmentVisibilityChanged$', 'punctualLightsChanged$', 'iblChanged$', 'renderEnvChanged$', 'morphingChanged$', 'addEnvironment$', 'colorChanged$', 'environmentRotationChanged$', 'animationPlayChanged$', ======= 'environmentVisibilityChanged$', 'punctualLightsChanged$', 'iblChanged$...
<<<<<<< export {GltfView, getIsGltf, getIsGlb, getIsHdr, computePrimitiveCentroids, loadGltfFromPath, loadEnvironment, initKtxLib, initDracoLib, loadGltfFromDrop }; ======= export { GltfView, getIsGltf, getIsGlb, computePrimitiveCentroids, loadGltf, loadPrefilteredEnvironmentFromPath, ini...
<<<<<<< fromJsonMeshes(jsonMeshes) { for (let i = 0; i < jsonMeshes.length; ++i) { let mesh = new gltfMesh(); mesh.fromJson(jsonMeshes[i]); this.meshes.push(mesh); } } ======= fromJsonSamplers(jsonSamplers) { for (let i = 0; i < ...
<<<<<<< const inputObservables = UIModel.getInputObservables(document.getElementById("canvas")); this.model = merge(dropdownGltfChanged, inputObservables.gltfDropped); this.hdr = inputObservables.hdrDropped; this.variant = app.variantChanged$.pipe(pluck("event", "msg")); } sta...
<<<<<<< gui.onModelSelected = (modelPath, basePath) => self.loadFromPath(modelPath, basePath); gui.onNextSceneSelected = () => self.sceneIndex++; gui.onPreviousSceneSelected = () => self.sceneIndex--; ======= gui.onLoadModel = (model) => self.loadFromPath(this.pathProvider.resolve(mode...
<<<<<<< import { ToneMaps, DebugOutput, Environments } from './rendering_parameters.js'; import { ImageMimeType } from './image.js'; ======= import { ToneMaps, DebugOutput } from './rendering_parameters.js'; import metallicRoughnessShader from './shaders/metallic-roughness.frag'; import primitiveShader from './shader...
<<<<<<< this.$.httpPass.loadData(), this.$.identities.loadData(), this.$.editPrefs.loadData(), this.$.diffPrefs.loadData(), ======= >>>>>>> this.$.identities.loadData(), this.$.editPrefs.loadData(), this.$.diffPrefs.loadData(),
<<<<<<< zh: { ======= kr: { translations: translationKr, }, "zh": { >>>>>>> kr: { translations: translationKr, }, zh: {
<<<<<<< handler.activationHandler && handler.activationHandler(component); ======= // We want to run the handler in a $timeout so the UI updates, but we also don't want it to run asyncronously // so that the steps below this one are run before the handler. So we run in a waitTimeout. a...
<<<<<<< * Shows browser-specific overlay with guidance how to proceed with gUM prompt. * @param {string} browser - name of browser for which to show the guidance * overlay. */ UI.showUserMediaPermissionsGuidanceOverlay = function (browser) { GumPermissionsOverlay.show(browser); }; /** * Hides browser-spe...
<<<<<<< var result = "<table style='width:100%'>" + "<tr>" + "<td><span class='jitsipopover_blue' data-i18n='connectionindicator.bitrate'></span></td>" + "<td><span class='jitsipopover_green'>&darr;</span>" + downloadBitrate + " <span class='jitsipopover_orange'>&uarr;</span>" + ...
<<<<<<< enableRecording: true, enableWelcomePage: false, enableSimulcast: false, logStats: false // Enable logging of PeerConnection stats via the focus ======= enableRecording: false, enableWelcomePage: true, enableSimulcast: false, enableFirefoxSupport: false //firefox support is sti...
<<<<<<< startRtpStatsCollector(); ======= // Bind data channel listener in case we're a regular participant if (config.openSctp) { bindDataChannelListener(sess.peerconnection); } >>>>>>> startRtpStatsCollector(); // Bind data channel listener in case we're a regular participant...
<<<<<<< ======= /* Popup window that show login page */ var authenticationWindow = null; /* Initial "authentication required" dialog */ var authDialog = null; /* Loop retry ID that wits for other user to create the room */ var authRetryId = null; >>>>>>> /* Initial "authentication required" dialog */ var authDialog ...
<<<<<<< /** * Removes the element indicating the moderator(owner) of the conference. */ SmallVideo.prototype.removeModeratorIndicatorElement = function () { $('#' + this.videoSpanId + ' .focusindicator').remove(); }; ======= /** * This is an especially interesting function. A naive reader might think that * ...
<<<<<<< ======= >>>>>>>
<<<<<<< toast = window.chat.toast, ======= toastTimeOut = 10000, chromeToast = null, >>>>>>> toast = window.chat.toast, <<<<<<< ======= function canToast() { // We can toast if it's not disabled return window.webkitNotifications && window.webkitNotifications.che...
<<<<<<< test('getEdgeHost', () => { TracerGlobals.setTracerInputs({ token: '', edgeHost: 'zarathustra.com' }); expect(utils.getEdgeHost()).toEqual('zarathustra.com'); TracerGlobals.setTracerInputs({ token: '', edgeHost: '' }); expect(utils.getEdgeHost()).toEqual( 'us-east-1.lumigo-tracer-edge...
<<<<<<< if (isExpr(on)) { on = on.toString(opts); } else { on = _.map(_.keys(on), function(key) { return handleColumn(key, opts) + ' = ' + handleColumn(on[key], opts); }).join(', ') } return this.type + ' JOIN ' + tbl + ' ON ' + on; ======= return this.type + ' JOIN ' + tbl + ' ON ' +...
<<<<<<< //setTimeout("loadOntPanel()", 3000); // westPanel.add(prevTree); // eastPanel.add(exportPanel); ======= >>>>>>> <<<<<<< function loginComplete() ======= function loginComplete(pmresponse) { if(GLOBAL.Debug) { alert(pmresponse.responseText); } oDomDoc = pmresponse.responseXML; var statusNode ...
<<<<<<< button.html("<i class='fa fa-refresh fa-spin'></i> Trying..."); $.ajax({ url: appPrefixed('/a/tools/regex_test'), data: { "string":URI.encode($("#xtrc-example").text()), "regex":$("#regex_value").val() }, success: fu...
<<<<<<< gulp.task('build:scripts', () => gulp.src('app/src/scripts/*.js') .pipe(babel()) .pipe(gulp.dest('app/dist'))); gulp.task('build', ['build:main', 'build:pug', 'build:css', 'build:js', 'build:scripts']); ======= gulp.task('build:js:common', () => gulp.src('app/src/common/*.js') .pipe(babel()) ...
<<<<<<< ======= import {ipcRenderer} from 'electron'; >>>>>>> import {ipcRenderer} from 'electron'; <<<<<<< import {convert as convertToGif} from './mp4-to-gif'; require('./reporter'); ======= import {init as initErrorReporter} from './reporter'; >>>>>>> import {convert as convertToGif} from './mp4-to-gif'...
<<<<<<< var mejsoptions = { defaultVideoWidth: 480, defaultVideoHeight: 270, videoWidth: -1, videoHeight: -1, audioWidth: -1, audioHeight: 30, startVolume: 0.8, loop: false, enableAutosize: true, features: ['playpause','current','progress','duration','tracks','volume','fullscr...
<<<<<<< tick: 0, deltaTime: 0, ======= count: 0, >>>>>>> tick: 0,
<<<<<<< require('../framebuffer-ref-count') require('../framebuffer-resize') require('../framebuffer-depth-stencil') require('../framebuffer-codegen') require('../stats') ======= require('../stats') require('../stats_gputime') >>>>>>> require('../framebuffer-ref-count') require('../framebuffer-resize') require('../f...
<<<<<<< this.processNextItem(); } }; /** * @private * Process the next pending event. */ SignalQueue.prototype.processNextItem = function() { var firstPendingItem = this.queue[0]; // Would normally use double-dispatch for this sort of thing, but // this is simpler and sufficient for...
<<<<<<< import Conf from './../context/conf'; import minimatch from 'minimatch'; let hookLoader, instrumentJs, shouldIgnore, shallInstrumentClientScript, shallInstrumentServerScript; ======= import Conf from './../context/conf'; import minimatch from 'minimatch'; let hookLoader, instrumentJs, shouldIgnore, shallIns...
<<<<<<< // TODO -- To be reviewed (f.guitton@imperial.ac.uk) analysisHeatmapPanel = new Ext.Panel( { id : 'analysisHeatmapPanel', title : 'Heatmap', region : 'center', split : true, height : 90, layout : 'fit', listeners : { activate : function(p) { GLOBAL.Cu...
<<<<<<< import RouteBasic from 'Components/Routes/Basic' import RouteMenuBubble from 'Components/Routes/MenuBubble' import RouteLinks from 'Components/Routes/Links' import RouteImages from 'Components/Routes/Images' import RouteHidingMenuBar from 'Components/Routes/HidingMenuBar' import RouteTodoList from 'Components/R...
<<<<<<< onTransaction: () => true, ======= onDrop: () => {}, >>>>>>> onDrop: () => {}, onTransaction: () => true,
<<<<<<< gameAction: ability.actions.playCard(context => ({ promptForSelect: { activePromptTitle: 'Choose a spell event', cardType: CardTypes.Event, controller: Players.Self, location: Locations.ConflictDiscardPil...
<<<<<<< const PlayAttachmentAction = require('./playattachmentaction.js'); ======= const PlayCharacterAction = require('./playcharacteraction.js'); >>>>>>> const PlayAttachmentAction = require('./playattachmentaction.js'); const PlayCharacterAction = require('./playcharacteraction.js'); <<<<<<< new PlayAttachme...
<<<<<<< this.game.addMessage('{0} discards {1} from their provinces', player, cardsToDiscard); _.each(cardsToDiscard, card => player.moveCard(card, 'dynasty discard pile')); ======= if(cardsToDiscard.length > 0) { this.game.addMessage...
<<<<<<< ======= strongholdCardClicked(sourcePlayer) { var player = this.getPlayerByName(sourcePlayer); if(!player) { return; } if(player.stronghold.bowed) { player.readyCard(player.stronghold); } else { player.bowCard(player.stronghold)...
<<<<<<< * Bows multiple cards * @param {[DrawCard]} cards * @param {EffectSource} source */ bowCards(cards, source) { _.each(cards, card => this.bowCard(card, source)); } /** * Raises an avent for an effect readying a card ======= * Raises an event for an effect read...
<<<<<<< hideWhenFaceUp: () => EffectBuilder.card.static(EffectNames.HideWhenFaceUp), immunity: (properties) => EffectBuilder.card.static(EffectNames.AbilityRestrictions, new CannotRestriction(properties)), ======= immunity: (properties) => EffectBuilder.card.static(EffectNames.AbilityRestrictions, new Res...
<<<<<<< directives.id = props.getId ? props.getId() : props.id || props._id || directives.id; ======= if (!directives.id) { directives.id = props.getId ? props.getId() : props.id || props._id; } >>>>>>> if (!directives.id) directives.id = props.getId ? props.getId() : props.id || props._id;
<<<<<<< ======= util.arrayFrom(this.querySelectorAll('[ons-tab-inactive], ons-tab-inactive')) .forEach(element => element.style.display = 'none'); util.arrayFrom(this.querySelectorAll('[ons-tab-active], ons-tab-active')) .forEach(element => element.style.display = 'inherit'); } setInactive()...
<<<<<<< const _ = require('lodash'); const isPlainObject = _.isPlainObject; const Boom = require('boom'); ======= const _ = require('lodash'); >>>>>>> const _ = require('lodash'); const isPlainObject = _.isPlainObject;
<<<<<<< return runSequence('core-test', 'e2e-test', done); }); //////////////////////////////////////// // e2e-test //////////////////////////////////////// gulp.task('e2e-test', function(done) { // `runSequence` causes dependency tasks to be run many times. // To prevent this issue, we have to use gulp 4.x and ...
<<<<<<< import ActionSheetExample from './examples/ActionSheet'; ======= import ToastExample from './examples/Toast'; >>>>>>> import ActionSheetExample from './examples/ActionSheet'; import ToastExample from './examples/Toast'; <<<<<<< title: 'Action sheet', component: ActionSheetExample }, ...
<<<<<<< _createdCallback() { ======= /** * @attribute on[-]infinite[-]scroll * @type {String} * @description * [en]Path of the function to be executed on infinite scrolling. Example: app.loadData[/en] * [ja]機能スクロール上で実行されている関数のパス。例:app.loadData[/ja] */ /** * @property onInfiniteScroll ...
<<<<<<< _compile() { if (this.getAttribute('position') === 'auto') { this.setAttribute('position', platform.isAndroid() ? 'top' : 'bottom'); } var wrapper = document.createDocumentFragment(); var content = document.createElement('div'); content.classList.add('ons-tab-bar__content'); co...
<<<<<<< this._clearDerivingEvents = $onsen.deriveEvents(this, element[0], ['reactive', 'postchange', 'prechange', 'init', 'show', 'hide', 'destroy']); ======= this._boundOnPrechange = this._onPrechange.bind(this); this._boundOnPostchange = this._onPostchange.bind(this); this._element.o...
<<<<<<< import contentReady from 'ons/content-ready'; ======= import OnsSplitterElement from './ons-splitter'; >>>>>>> import contentReady from 'ons/content-ready'; import OnsSplitterElement from './ons-splitter';
<<<<<<< var toolbarButton = new GenericView(scope, element, attrs); $onsen.declareVarAttribute(attrs, toolbarButton); $onsen.aliasStack.register('ons.toolbarButton', toolbarButton); element.data('ons-toolbar-button', toolbarButton); scope.$on('$destroy', function() {...
<<<<<<< const locations = { ios: [1, 21], material: [0, 16] }; const getX = (e) => { if (e.gesture) { e = e.gesture.srcEvent; } return e.clientX || e.changedTouches[0].clientX; }; class SwitchElement extends BaseElement { ======= /** * @element ons-switch * @category form * @description * [en]Swi...
<<<<<<< var VALID_TARGETS = ['database', 'storage', 'firestore', 'functions', 'hosting']; if (!previews.functions && !previews.firestore) { VALID_TARGETS.splice(2, 2); } else if (!previews.functions) { VALID_TARGETS.splice(3, 1); } else if (!previews.firestore) { VALID_TARGETS.splice(2, 1); } var deployScopes = ...
<<<<<<< var VALID_TARGETS = ['database', 'storage', 'firestore', 'functions', 'hosting']; if (!previews.functions && !previews.firestore) { VALID_TARGETS.splice(2, 2); } else if (!previews.functions) { VALID_TARGETS.splice(3, 1); } else if (!previews.firestore) { VALID_TARGETS.splice(2, 1); } var deployScopes = ...
<<<<<<< var tokens = Token.ize(lhs) if(op != "." ) tokens.tail().eaten.right.push(Token.ize(" ")) ======= var tokens = Token.ize(lhs) if(op != "." ) tokens.tail().eaten.right.push(Token.ize(" ")) >>>>>>> <<<<<<< ======= >>>>>>>
<<<<<<< * - *data* - Raw object with keys and values to pass with request as query params. Default `null`. ======= * - *data* - Raw object with keys and values to pass with request. Default `null`. * - *headers* - Set of request headers to add. Default `{}`. >>>>>>> * - *data* - Raw object with keys and valu...
<<<<<<< if (config.debug) var log = console.log.bind(window.console) else var log = function () {} ======= // Can activate this for users using a little code if (config.dev) { var log = console.log.bind(window.console) } else var log = function () {} >>>>>>> // Can activate this for users using a little code if (c...
<<<<<<< /** * Call {@link #setValue()} and {@link #onChange()} * @param {String|String[]} value The new choice or choices depending on the * format of this field. */ selectionChanged(value) { this.setValue(value); this.onChange(); } ======= /* * Called by ...
<<<<<<< if(response.statusCode === 403){ reject('User account is not signed in. Requested operation is forbidden. Please sign in to Structor Market.'); }else if (response.statusCode === 401) { ...
<<<<<<< export const invertLuminance = base => { const color = chroma(base) const luminance = color.luminance() const [ h, s ] = color.hsl() const next = chroma.hsl(h, s, 1 - luminance) return next.hex() } const colors = createColors('#06e') ======= export const colors = createColors('#06e') >>>>>>> expor...
<<<<<<< EVENT_THROTTLE: 100, defaultEvents: ['keydown', 'mousedown', 'scroll', 'touchstart', 'storage'], enabledEvents: null, _eventsListened: null, _eventSubscriberCount: null, _throttledEventHandlers: null, _boundEventHandler: null, localStorageKey: 'ember-user-activity', // Fastboot compatibilit...
<<<<<<< $scope.params = { ======= $scope.params = params || { bulk: false, >>>>>>> $scope.params = params || {
<<<<<<< require('papp-polyfill'); ======= import fetch from './utils/fetch'; >>>>>>> require('papp-polyfill'); import fetch from './utils/fetch';
<<<<<<< var ansiEscapes = require('ansi-escapes'); ======= >>>>>>> var ansiEscapes = require('ansi-escapes'); <<<<<<< var suggesText = this.opt.suggestOnly ? ', tab to autocomplete' : ''; message += chalk.dim('(Use arrow keys or type to search' + suggesText + ')'); ======= content += chalk.dim('(Use a...
<<<<<<< <S.Container> <S.LeftColumn> <S.Infos> <S.InfosTechs>{challenge.techs}</S.InfosTechs> <S.InfosLevel>{challenge.level}</S.InfosLevel> <S.InfosType>{challenge.type}</S.InfosType> ...
<<<<<<< RawList.defaultProps = { tabIndex: -1, }; export default RawList; ======= export default onClickOutside(RawList); >>>>>>> RawList.defaultProps = { tabIndex: -1, }; export default onClickOutside(RawList);
<<<<<<< import BarChart from '../components/charts/BarChartComponent'; ======= >>>>>>> import BarChart from '../components/charts/BarChartComponent'; <<<<<<< const {breadcrumb} = this.props; const data = [ {name: "Alice", value: 2}, {name: "Bob", value: 3}, {nam...
<<<<<<< NEW_DOCUMENT: mod + '+' + 'm', FOCUS_FAST_LINE_ENTRY: mod + '+' + 'q', ======= NEW_DOCUMENT: mod + '+' + 'm' >>>>>>> NEW_DOCUMENT: mod + '+' + 'm' <<<<<<< ======= TABLE_CONTEXT: { TOGGLE_QUICK_INPUT: mod + '+' + 'q', TOGGLE_EXPAND: mod + '+' + 'l' }...
<<<<<<< closeCallback={this.closeModalCallback} ======= closeCallback={(isNew) => this.closeModalCallback( modal.modalType, isNew, modal.layout.pinstanceId )} rawModalVisible={rawModal.visible} ...
<<<<<<< isShown, isHidden, handleBackdropLock, subentity, subentityId, tabIndex, viewId, dropdownOpenCallback ======= isShown, isHidden, handleBackdropLock, subentity, subentityId, tabIndex, viewId, autoFocus >>>>>>> isShown, isHidden, handleBackdropLock, s...
<<<<<<< import { SalesInvoice, SalesInvoiceLine } from '../../support/utils/sales_invoice'; import { getLanguageSpecific, appendHumanReadableNow } from '../../support/utils/utils'; import { DocumentActionKey, DocumentStatusKey } from '../../support/utils/constants'; import { BPartner } from '../../support/utils/bpartne...
<<<<<<< var WebpackGitHash = require('webpack-git-hash'); var commitHash = require('child_process') .execSync('git rev-parse --short HEAD') .toString(); ======= var fs = require('fs'); const plugins = [ new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production'), }, }), ...
<<<<<<< <div ref={c => (this.dropdown = c)} className={classnames('input-dropdown-container', { 'input-disabled': readonly, 'input-dropdown-container-static': rowId, 'input-table': rowId && !isModal, 'lookup-dropdown': lookupList, 'select-dropdown'...
<<<<<<< listenOnKeys={listenOnKeys} listenOnKeysFalse={listenOnKeysFalse} closeTableField={closeTableField} ======= inputValue={data} >>>>>>> listenOnKeys={listenOnKeys} listenOnKeysFalse={listenOnKeysFalse} ...