conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
return ParserHelpers.addParsedVariableToModule(parser, id, req);
};
if (this.options.worker !== false) {
parser.hooks.new.for('Worker').tap(NAME, handleWorker('Worker'));
}
if (this.options.sharedWorker) {
parser.hooks.new.f... |
<<<<<<<
var hide = __webpack_require__(7);
=======
var createNonEnumerableProperty = __webpack_require__(7);
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
<<<<<<<
/* 5 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
val... |
<<<<<<<
=======
var global = __webpack_require__(0);
var getOwnPropertyDescriptor = __webpack_require__(31).f;
var hide = __webpack_require__(5);
var redefine = __webpack_require__(14);
var setGlobal = __webpack_require__(36);
var copyConstructorProperties = __webpack_require__(77);
var isForced = __webpack_require__... |
<<<<<<<
=======
/***/ (function(module, exports) {
module.exports = function (exec) {
try {
return !!exec();
} catch (error) {
return true;
}
};
/***/ }),
/* 5 */
/***/ (function(module, exports) {
var hasOwnProperty = {}.hasOwnProperty;
module.exports = function (it, key) {
return hasOwnProperty... |
<<<<<<<
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
define([], factory);
else if(typeof exports === 'object')
exports["OpenPlayer"] = factory();
else
root["OpenPlayer"] = factory();
})(this, function() {
return... |
<<<<<<<
=======
var AbstractAssertion = function(abortOnFailure, client) {
this.abortOnFailure = abortOnFailure;
this.client = client;
}
>>>>>>>
<<<<<<<
var AbstractAssertion = function(abortOnFailure, client) {
this.abortOnFailure = abortOnFailure;
this.client = client;
}
=======
>>... |
<<<<<<<
/*!
* Module dependencies.
*/
var util = require('util');
var fs = require('fs');
var path = require('path');
var events = require('events');
var HttpRequest = require('./request.js');
var CommandQueue = require('./queue.js');
var Assertion = require('./assertion.js');
var Logger = require('./logger.js');
var... |
<<<<<<<
console.log(Logger.colors.green('OK. ' + testresults.passed, Logger.colors.background.black),
'total assertions passed. (' + elapsedTime + ' ms)');
=======
console.log(Logger.colors.green('\nOK. ' + testresults.passed), 'total assertions passed. (' + elapsedTime + ' ms)');
>>>>>>>
c... |
<<<<<<<
MOUSE_BUTTON_LEFT = 'left',
MOUSE_BUTTON_MIDDLE = 'middle',
MOUSE_BUTTON_RIGHT = 'right',
DIRECTION_UP = 'up',
DIRECTION_DOWN = 'down';
=======
MOUSE_BUTTON_LEFT = "left",
MOUSE_BUTTON_MIDDLE = "middle",
MOUSE_BUTTON_RIGHT = "right",
DIRECTION_UP = "up",
DIRECTION_DOWN... |
<<<<<<<
it('Should have sent an email to the user with an auth token', function(done) {
var email = template.hooks.getLastEmail();
assert.equal(email.from, 'no-reply@form.io');
assert.equal(email.to, template.users.user1.data.email);
assert.equal(email.subject, 'New user ' + template.users.u... |
<<<<<<<
module.exports = function(router) {
const audit = router.formio.audit || (() => {});
=======
module.exports = (router) => {
>>>>>>>
module.exports = (router) => {
const audit = router.formio.audit || (() => {});
<<<<<<<
if (!_.get(user.data, passField)) {
audit('EAUTH_BLANKPW', {
... |
<<<<<<<
// Allow an alter of the export logic.
hook.alter('export', req, query, form, exporter, (err) => {
if (err) {
return res.status(500).send(err.message);
}
// Initialize the exporter.
exporter.init()
.then(() => {
const addUrl = (data) =... |
<<<<<<<
this$1.authInstance.signIn()
.then(function (response) {
this$1._setSession(response)
res()
}, (error) => {
rej(error)
})
})
=======
this$1.authInstance.grantOfflineAccess().then(function (response) {
localStorage.setItem("gapi.refr... |
<<<<<<<
if (this.databaseType === 'sql' || this.databaseType === 'mongodb' || this.databaseType === 'couchbase') {
=======
this.copyFilteringFlag(this, this.data);
if (this.databaseType === 'sql' || this.databaseType === 'mongodb') {
>>>>>>>
this.copyFilteringFlag(this... |
<<<<<<<
if (generator.isJhipsterVersionLessThan('5.0.0')) {
generator.removeFile(`${ANGULAR_DIR}/app.route.ts`);
}
=======
if (generator.isJhipsterVersionLessThan('5.0.0')) {
generator.removeFile(`${ANGULAR_DIR}shared/auth/account.service.ts`);
generator.removeFile(`${ANGULAR_DIR}s... |
<<<<<<<
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap.yml');
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap-dev.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap-dev.yml');
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstr... |
<<<<<<<
{
condition: generator => generator.authenticationType === 'session',
path: TEST_SRC_DIR,
templates: [
'spec/app/modules/account/sessions/sessions.reducer.spec.ts',
]
}
=======
{
condition: generator => !genera... |
<<<<<<<
context('when passing valid args', () => {
context('with no error', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/complex_jdl.jdl']);
content = JDLParser.parse(input, 'mysql');
});
=======
describe('when ... |
<<<<<<<
=======
module.exports = {
writeFiles
};
let firstEntityGenerate = true;
>>>>>>>
<<<<<<<
return {
setupReproducibility() {
if (this.skipClient) return;
// In order to have consistent results with Faker, restart seed with current entity name hash.
faker.s... |
<<<<<<<
this.cacheManagerIsAvailable = ['ehcache', 'hazelcast', 'infinispan', 'memcached', 'redis'].includes(this.cacheProvider);
=======
this.cacheManagerIsAvailable = ['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached'].includes(this.cacheProvider);
>>>>>>>
... |
<<<<<<<
} else if (['Instant', 'ZonedDateTime', 'LocalDate'].includes(field.fieldType)) {
// Iso: YYYY-MM-DDTHH:mm:ss.sssZ
const isoDate = faker.getRecentDate(1, changelogDate).toISOString();
if (field.fieldType === 'LocalDate') {
data = isoDate.split('T')[0];
} else {
... |
<<<<<<<
=======
'spec/app/admin/metrics/metrics-modal.component.spec.ts',
'spec/app/core/user/account.service.spec.ts',
>>>>>>>
'spec/app/core/user/account.service.spec.ts', |
<<<<<<<
constructor (options = {}) {
super(commentsReplies, {
comment: options.comment,
canComment: options.canComment
});
this.comment = options.comment;
this.form = this.find('form')[0];
this.state('initialized');
this.fetch();
=======
constructor (comment) {
super(comm... |
<<<<<<<
=======
`${CLIENT_TEST_SRC_DIR}spec/app/admin/metrics/metrics-modal.component.spec.ts`,
`${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`,
>>>>>>>
`${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`, |
<<<<<<<
const JHIPSTER_DEPENDENCIES_VERSION = '3.8.0-SB2.3-SNAPSHOT';
=======
const JHIPSTER_DEPENDENCIES_VERSION = '3.10.0-SNAPSHOT';
>>>>>>>
const JHIPSTER_DEPENDENCIES_VERSION = '3.8.0-SB2.3-SNAPSHOT';
<<<<<<<
const SPRING_BOOT_VERSION = '2.3.3.RELEASE';
const LIQUIBASE_VERSION = '3.9.0';
=======
const SPRING_... |
<<<<<<<
condition: generator => generator.authenticationType === 'jwt' && !generator.reactive,
path: SERVER_MAIN_SRC_DIR,
templates: [
{
file: 'package/security/jwt/JWTConfigurer.java',
renameTo: generator => `${generator.javaDi... |
<<<<<<<
if (this.databaseType == 'sql' || this.databaseType == 'mongodb') {
this.template('src/main/java/package/web/rest/dto/_UserManagementDTO.java', javaDir + 'web/rest/dto/UserManagementDTO.java', this, {});
this.template('src/main/java/package/web/rest/mapper/_UserManagementMapper.java', javaDir... |
<<<<<<<
exports.all = function all (fn) {
log('Looking for all comments.');
=======
exports.all = function all (fn) {
log('Looking for all comments.')
>>>>>>>
exports.all = function all (fn) {
log('Looking for all comments.')
<<<<<<<
log('Found error %j', err);
return fn(err);
}
=======
... |
<<<<<<<
// require('settings');
// require('help');
import '../admin/admin.js';
=======
import '../settings/settings.js';
import '../help/help.js';
// require('admin');
>>>>>>>
import '../admin/admin.js';
import '../settings/settings.js';
import '../help/help.js'; |
<<<<<<<
done();
});
},
loadConfig() {
this.defaultAppsFolders = this.config.get('appsFolders');
this.directoryPath = this.config.get('directoryPath');
this.clusteredDbApps = this.config.get('clusteredDbApps');
this.serviceDisco... |
<<<<<<<
const DOCKER_MSSQL = 'microsoft/mssql-server-linux:latest';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:3.12.6';
const DOCKER_MEMCACHED = 'memcached:1.5.19-alpine';
const DOCKER_REDIS = 'redis:5.0.6';
const DOCKER_KEYCLOAK = 'jboss/keycloak:7.0.0'; // The version should match the att... |
<<<<<<<
const WebpackNotifierPlugin = require('webpack-notifier');
=======
const AddAssetHtmlPlugin = require('add-asset-html-webpack-plugin');
>>>>>>>
<<<<<<<
new StringReplacePlugin(),
new WebpackNotifierPlugin({
title: 'JHipster',
contentImage: path.join(__... |
<<<<<<<
const istio = this.istio;
this.ingressDomain = this.ingressDomain && this.ingressDomain.startsWith('.') ? this.ingressDomain.substring(1) : this.ingressDomain;
=======
>>>>>>>
const istio = this.istio;
this.ingressDomain = this.ingressDomain && this.ingressDomain.startsWith('.') ? this.ingres... |
<<<<<<<
}
Generator.prototype.isJhipsterVersionLessThan = function(version) {
var jhipsterVersion = this.config.get('jhipsterVersion');
if (!jhipsterVersion) {
return true;
}
return semver.lt(jhipsterVersion, version);
=======
}
Generator.prototype.contains = _.contains;
Generator.prototype... |
<<<<<<<
this.stripMargin(`|<DropdownItem tag={Link} key="${routerName}" to="/entity/${routerName}">
| <FontAwesomeIcon icon={faAsterisk} /> ${_.startCase(routerName)}
| </DropdownItem>,`)
=======
this.str... |
<<<<<<<
const AddAssetHtmlPlugin = require('add-asset-html-webpack-plugin');
=======
const WebpackNotifierPlugin = require('webpack-notifier');
>>>>>>>
const AddAssetHtmlPlugin = require('add-asset-html-webpack-plugin');
const WebpackNotifierPlugin = require('webpack-notifier');
<<<<<<<
utils.root('src/... |
<<<<<<<
const { repo, description, url, twitter } = this.state.project;
=======
const {
name,
description,
url,
twitter,
issueNumber
} = this.state.project;
const issueURL = `${url}/issues/${issueNumber}`;
>>>>>>>
const {
repo,
description,
url,
twitter,
issueNumber
} = ... |
<<<<<<<
// include: ['src/as/**/*.spec.ts'],
// include: ['src/as/**/Mesh.spec.ts'],
// include: ['src/as/**/Geometry.spec.ts'],
include: ['src/as/**/BufferAttribute.spec.ts'],
=======
include: ['src/as/index.spec.ts'],
>>>>>>>
// include: ['src/as/index.spec.ts'],
// include: ['src/as/**/Mesh.spec.ts'],
// ... |
<<<<<<<
if (!meta) {
=======
if (!meta || !meta.codec) {
if (this._hasAudio === false) {
this._hasAudio = true;
this._mediaInfo.hasAudio = true;
}
>>>>>>>
if (!meta) {
if (this._hasAudio === false) {
this._ha... |
<<<<<<<
deltaX = Math.abs(pageX - self.startPageX);
deltaY = Math.abs(pageY - self.startPageY);
if (deltaX > 5) {
event.preventDefault();
self.moveReady = true;
self.element.addEventListener('click', self, true);
}
else if (deltaY > 5) {
self.scrolling = false;
self._to... |
<<<<<<<
test('apiMiddleware must dispatch an error request FSA when [RSAA].options fails', (t) => {
const anAction = {
[RSAA]: {
endpoint: '',
method: 'GET',
options: () => { throw new Error(); },
types: [
{
type: 'REQUEST',
payload: 'ignoredPayload',
... |
<<<<<<<
// TODO: should we lookup the instance ID for this client here?
// TODO: say not if we havn't given them permission :)
uiChannel.on('start-using-peer-as-proxy-server', function(peerInstanceId) {
startUsingPeerAsProxyServer(state.instanceToClient[peerInstanceId]);
=======
// InstanceId given from extension... |
<<<<<<<
// TODO: should we lookup the instance ID for this client here?
// TODO: say not if we havn't given them permission :)
freedom.on('startUsingPeerAsProxyServer', peerClientId) {
client.emit("start",
{'host': '127.0.0.1', 'port': 9999,
// peerId of the peer being routed to.
'p... |
<<<<<<<
"identityStatus": {},
=======
'identityStatus': {},
>>>>>>>
'identityStatus': {},
<<<<<<<
// Local client's information.
"me": {
"description": "",
"instanceId": "",
"keyHash": "",
"peerAsProxy": null,
"peersAsClients": []
},
=======
'me': {
'description': '',
... |
<<<<<<<
(this.app.hasPythonFileOpen() && !this.lastShown[state]);
=======
(this.app.hasSupportedFileOpen() && !this.lastRejected[state]);
>>>>>>>
(this.app.hasSupportedFileOpen() && !this.lastShown[state]); |
<<<<<<<
if (!symbolId) { return; }
DataLoader.openInWebForId(symbolId(token.Symbol));
=======
DataLoader.openInWebForId(symbolId(token.Symbol || token.symbol));
metrics.track('Context menu Open in web clicked');
>>>>>>>
DataLoader.openInWebForId(symbolId(token.Symbol || token... |
<<<<<<<
constructor(kite) {
=======
constructor() {
if (!Emitter) { ({Emitter} = require('atom')); }
>>>>>>>
constructor(kite) {
if (!Emitter) { ({Emitter} = require('atom')); } |
<<<<<<<
(this.hasPythonFileOpen() && !this.lastShown[state]);
}
hasPythonFileOpen() {
return atom.workspace.getTextEditors().some(e => /\.py$/.test(e.getPath() || ''));
=======
(this.app.hasPythonFileOpen() && !this.lastRejected[state]);
>>>>>>>
(this.app.hasPythonFileOpen() &&... |
<<<<<<<
if (KiteAPI.hasManyKiteInstallation() ||
KiteAPI.hasManyKiteEnterpriseInstallation()) {
this.instrumentNotification(atom.notifications.addWarning(
=======
if (StateController.hasManyKiteInstallation() ||
StateController.hasManyKiteEnterpriseInstallation()) {
thi... |
<<<<<<<
this.getStatusPanel().setApp(this.app);
=======
this.getSearchItem().setApp(this.app);
>>>>>>>
this.getStatusPanel().setApp(this.app);
this.getSearchItem().setApp(this.app);
<<<<<<<
getStatusPanel() {
if (this.statusPanel) { return this.statusPanel; }
if (!KiteStatusPanel) { KiteSt... |
<<<<<<<
=======
const ensureKite = () => { if (!Kite) { Kite = require('./kite'); } };
const pendingStatusRequestByEditor = {};
>>>>>>>
const pendingStatusRequestByEditor = {};
<<<<<<<
return KiteAPI.getStatus(editor.getPath());
=======
const filepath = editor.getPath();
const path = statusPath(fil... |
<<<<<<<
const EditorEvents = require('./editor-events');
=======
const DataLoader = require('./data-loader');
>>>>>>>
const EditorEvents = require('./editor-events');
const DataLoader = require('./data-loader'); |
<<<<<<<
this.templates = require('./templates')(this);
=======
this.suppressionList = require('./suppressionList')(this);
>>>>>>>
this.suppressionList = require('./suppressionList')(this);
this.templates = require('./templates')(this); |
<<<<<<<
const { Contract } = require('ethers');
=======
const { ethersBnToBn, bnToEthersBn } = require('./utils');
>>>>>>>
const { Contract } = require('ethers');
<<<<<<<
isEthAddress(address, { strict: true });
const { isNative } = contracts;
const getETH = () => contracts.eth.getBalance(address).catch... |
<<<<<<<
* @fileOverview This file adds support for the {@link chrome.storage.local} API in Firefox. This API isn’t implemented until Firefox version 48 for content-scripts.
* @name background.js<firefox>
* @author Etienne Prud’homme
* @license MIT
=======
* @fileoverview This file adds support for the {@link chr... |
<<<<<<<
* @fileOverview This file contains the constructor for a `Suite` of tests.
* @name Suite.js<GE>
* @author Cameron Pittman
* @license MIT
=======
* @fileoverview This file contains the constructor for a `Suite` of tests.
* @name Suite.js<js>
* @author Cameron Pittman
* @license GPLv3
>>>>>>>
* @fileO... |
<<<<<<<
/**
* @fileOverview Udacity’s library for immediate front-end feedback.
* @name intro.js<GE>
* @author Cameron Pittman
* @license MIT
*/
=======
/**
* @fileOverview Udacity’s library for immediate front-end feedback.
* @name intro.js<js>
* @author Cameron Pittman
* @license GPLv3
*/
/*
*/
>>>>>>>
/... |
<<<<<<<
/**
* @fileOverview This file contains procedures to inject and import the Grading Engine and its widgets.
* @name inject.js<inject>
* @author Cameron Pittman
* @license MIT
*/
=======
/**
* @fileoverview This file manages the injection of several JavaScript files. It contains most procedure for inject... |
<<<<<<<
import { PoseDOM, PoserFLIP, PoserPassive, PoseDrag } from "./plugins/pose";
import {
ReactPose,
ReactPoseChildren,
Group,
EmailList
} from "./plugins/react-pose";
=======
import { PoseDOM, PoserFLIP, PoserPassive, PoseDrag, PoserManualValues } from "./plugins/pose";
import { ReactPose, ReactPoseChild... |
<<<<<<<
hasChildren = (preprocessedValue.children !== undefined);
=======
hasChildren = (thisValue.children !== undefined);
thisValue.action = preprocessedValue.link ? 'link' : actor.action;
defaultProps = actionsManager[thisValue.action].valueDefaults;
... |
<<<<<<<
import { ACTION, cols } from '~/styles/vars';
import { fontSize, lineHeight, fontBold } from '~/styles/fonts';
export const Container = styled.section`
padding-top: ${cols(4)};
display: flex;
align-items: center;
flex-direction: column;
`;
export const Blurb = styled.p`
${fontSize(24)}
${lineHeigh... |
<<<<<<<
"use strict";
var KEY = require('../opts/keys.js'),
rQuery = function () {
var REDSHIFT = 'redshift',
execute = function ($element, action, arg1, arg2, arg3) {
$element.each(function () {
var $this = $(this),
thisRedshift = $this.data(REDSHIFT);
// If we ... |
<<<<<<<
// if (contracts.isNative) {
// const withdrawGas = ethersBnToBn(
// await clerkContract.estimate.withdraw(amount),
// );
// const gasPrice = new BN((await contracts.eth.getGasPrice()).toString());
// const withdrawWeiCost = withdrawGas.mul(gasPrice);
// const weiAmount... |
<<<<<<<
import '@storybook/addon-knobs/register';
import '@storybook/addon-a11y/register';
=======
import '@storybook/addon-knobs/register';
import '@storybook/addon-viewport/register';
>>>>>>>
import '@storybook/addon-knobs/register';
import '@storybook/addon-a11y/register';
import '@storybook/addon-viewport/regist... |
<<<<<<<
const signedOrder = await order.signOrder(
chain.contracts,
order.APP_ORDER,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
... |
<<<<<<<
truncateBnWeiToBnNRlc,
bnNRlcToBnWei,
=======
encodeTag,
decodeTag,
bytes32Regex,
>>>>>>>
truncateBnWeiToBnNRlc,
bnNRlcToBnWei,
encodeTag,
decodeTag,
bytes32Regex, |
<<<<<<<
const signedOrder = await order.signApporder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
);
spinner.inf... |
<<<<<<<
ethersBnToBn,
bnToEthersBn,
ethersBigNumberify,
truncateBnWeiToBnNRlc,
bnNRlcToBnWei,
} = require('./utils');
const foreignBridgeErcToNativeDesc = require('./abi/bridge/ForeignBridgeErcToNative.json');
const homeBridgeErcToNativeDesc = require('./abi/bridge/HomeBridgeErcToNative.json');
const { addre... |
<<<<<<<
const {resources, type, name} = task
=======
const {compute_on} = this.state;
const {resources, type} = task
>>>>>>>
const {compute_on} = this.state;
const {resources, type, name} = task |
<<<<<<<
function calcFrameAmount(_frame){
const notationArry = _frame.match(/(\d+)(-)?(\d+)?(;\d)?/g)
const calculateNotation = item => {
if (!isNaN(item))
return 1
if (item.includes(";")) {
[item, diff] = item.split(";");
}
const splitI... |
<<<<<<<
<ReactTooltip placement="bottom" trigger={['hover']} overlay={this._taskHints(isEngineOn, connectedPeers)} mouseEnterDelay={1} align={{
=======
<ReactTooltip overlayClassName="black" placement="bottom" trigger={['hover']} overlay={isEngineOn ? <p>New Task</p> : <p>Golem... |
<<<<<<<
},
checkUpdate: function (_old, _new) {},
warn: function () {}
=======
},
isMac: function () {}
>>>>>>>
},
checkUpdate: function (_old, _new)... |
<<<<<<<
}),
LuxRender: yup.object().shape({
resolution: yup.array().of(yup.number().min(100).max(8000)).required(),
output_path: yup.string(),
format: yup.string(),
samples: yup.number().min(1).required(),
=======
>>>>>>>
<<<<<<<
}
=======
... |
<<<<<<<
=======
const appWidth = window.innerWidth
|| document.documentElement.clientWidth
|| document.body.clientWidth;
>>>>>>>
const appWidth = window.innerWidth
|| document.documentElement.clientWidt... |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
SET_CONNECTION_PROBLEM: 'SET_CONNECTION_PROBLEM',
SET_COMPONENT_WARNING: 'SET_COMPONENT_WARNING',
SET_FILE_CHECK: 'SET_FILE_CHECK'
})
=======
SET_CONNECTION_PROBLEM: "SET_CONNECTION_PROBLEM",
SET_FILE_CHECK: "SET_FILE_CHECK"
});
>>>>>>>
SET_CONNECTION_PROBLEM: 'SET_CONNECTION_PROBLEM'... |
<<<<<<<
=======
import Lottie from 'react-lottie';
import animData from './../../../assets/anims/warning';
const defaultOptions = {
loop: false,
autoplay: true,
animationData: animData,
rendererSettings: {
preserveAspectRatio: 'xMidYMid slice'
}
};
>>>>>>>
import Lottie from 'react-lot... |
<<<<<<<
//ACCOUNT
SET_PUBLIC_KEY: 'SET_PUBLIC_KEY',
CALL_WITHDRAW_MODAL: 'CALL_WITHDRAW_MODAL',
WITHDRAW: 'WITHDRAW',
=======
SET_PASSWORD: 'SET_PASSWORD',
>>>>>>>
//ACCOUNT
SET_PUBLIC_KEY: 'SET_PUBLIC_KEY',
CALL_WITHDRAW_MODAL: 'CALL_WITHDRAW_MODAL',
WITHDRAW: 'WITHDRAW',
SET... |
<<<<<<<
const mapDispatchToProps = dispatch => ({
actions: bindActionCreators(Actions, dispatch)
})
export class Personal extends React.Component {
=======
//<p/><span className="icon-question-mark"/> Deleted
export default class Personal extends React.Component {
>>>>>>>
const mapDispatchToProps = dispatch => ... |
<<<<<<<
if (currentStep === 6) {
this.props.actions.updateNodeName(nodeName)
=======
if (currentStep === 2) {
const queuedTask = {
action: "updateNodeName",
arguments: [nodeName]
}
this.props.actions.addQueue(queuedTask)
... |
<<<<<<<
<InfoLabel type="span" label="Frame Range" info={<p className="tooltip_task">Define frames to render. You can separate frame numbers with ;, eg. 1;4;7 will define<br/>frame 1, 4 and 7. You can also define frames ranges with - <a href="https://docs.golem.network/#/Products/Brass-Beta/... |
<<<<<<<
GET_FRAGMENTS,
=======
SET_DIRECTORY_TREE,
>>>>>>>
GET_FRAGMENTS,
SET_DIRECTORY_TREE,
<<<<<<<
SET_CONNECTION_PROBLEM,
SET_FILE_CHECK
} = dict;
=======
SET_CONNECTION_PROBLEM,
SET_COMPONENT_WARNING,
SET_FILE_CHECK
} = dict;
>>>>>>>
SET_CONNECTION_PROBLEM,
SET_C... |
<<<<<<<
=======
const {remote} = window.electron
const { configStore, dictConfig } = remote.getGlobal('configStorage')
export const APP_VERSION = "v0.8.1"
>>>>>>>
const {remote} = window.electron
const { configStore, dictConfig } = remote.getGlobal('configStorage') |
<<<<<<<
SET_PASSWORD_MODAL: 'SET_PASSWORD_MODAL',
=======
ADD_QUEUE: 'ADD_QUEUE',
REMOVE_FROM_QUEUE: 'REMOVE_FROM_QUEUE',
>>>>>>>
SET_PASSWORD_MODAL: 'SET_PASSWORD_MODAL',
ADD_QUEUE: 'ADD_QUEUE',
REMOVE_FROM_QUEUE: 'REMOVE_FROM_QUEUE',
<<<<<<<
SET_PASSWORD_MODAL,
=======
ADD_QUEUE,... |
<<<<<<<
=======
const isIntersectionObserverSupported = typeof window.IntersectionObserver === 'function';
if (!isIntersectionObserverSupported) {
require('intersection-observer');
}
>>>>>>> |
<<<<<<<
css = marigold.css(["*.styl", "demos/**/*.styl", "doc/**/*.styl"]),
=======
devServer = builder.devServer([
"*.js",
"!gulpfile.js",
"*.css",
"*.html",
"demos/**/*.js",
"demos/**/*.css",
"demos/**/*.html",
"doc/**/*.js",
"doc/**/*.css",
"doc/**/*.html"
]),
htm... |
<<<<<<<
case 'microsoftteams':
return 'NotificationMicrosoftTeams';
=======
case 'email':
return 'NotificationEmail';
>>>>>>>
case 'microsoftteams':
return 'NotificationMicrosoftTeams';
case 'email':
return 'NotificationEmail';
<<<<<<<
addN... |
<<<<<<<
* License - http://github.com/adaptlearning/adapt_framework/LICENSE
* Maintainers - Alan Bourne, Chris Jones, Daryl Hedley
=======
* License - https://github.com/adaptlearning/adapt_framework/blob/master/LICENSE
* Maintainers - Alan Bourne, Chris Jones
>>>>>>>
* License - https://github.com/adaptlearning/ada... |
<<<<<<<
var NotifyPushView = Backbone.View.extend({
className: function () {
return 'notify-push ' + this.model.get('_classes');
},
attributes: {
'role': 'dialog',
'aria-labelledby': 'notify-push-heading',
'aria-modal': 'false'
},
initialize: function () {
this.lis... |
<<<<<<<
var AdaptView = Backbone.View.extend({
attributes: function() {
return {
"data-adapt-id": this.model.get('_id')
};
},
initialize: function() {
this.listenTo(Adapt, 'remove', this.remove);
this.listenTo(this.model, {
'change:_isVisible': this.toggleVisibili... |
<<<<<<<
The version control base ref for deployments (e.g., branch name, tag, or commit id)
"""
deployBaseRef: String
"""
The version control head ref for deployments (e.g., branch name, tag, or commit id)
"""
deployHeadRef: String
"""
The title of the last deployment (PR title)
... |
<<<<<<<
input AddCustomerInput {
=======
input DeploymentInput {
id: Int
name: String!
status: DeploymentStatusType!
created: String!
started: String
completed: String
environment: Int!
remoteId: String
}
input DeleteDeploymentInput {
id: Int!
}
input UpdateDeployment... |
<<<<<<<
'breadcrumbs': false,
'iframe': iframeBaseSettings
=======
'iframe': iframeBaseSettings,
'fileDownloadApi': false
>>>>>>>
'breadcrumbs': false,
'fileDownloadApi': false,
'iframe': iframeBaseSetting... |
<<<<<<<
Mousetrap.prototype.stopCallback = function(event, element) {
=======
Mousetrap.stopCallback = function(event, element) {
if (!mouseTrapEnabled) {
return true;
}
>>>>>>>
Mousetrap.prototype.stopCallback = function(event, element) {
if (!mouseTrapEnabled) {... |
<<<<<<<
"""
Lagoon Customer (used for grouping multiple Projects)
"""
=======
type User {
id: Int
email: String
firstName: String
lastName: String
comment: String
gitlabId: Int
sshKeys: [SshKey]
}
>>>>>>>
type User {
id: Int
email: String
firstName: String
l... |
<<<<<<<
require('../lib/tile-layer.directive.spec');
require('../lib/popup.directive.spec');
=======
require('../lib/tile-layer.directive.spec');
require('../lib/image-overlay.directive.spec');
>>>>>>>
require('../lib/tile-layer.directive.spec');
require('../lib/image-overlay.directive.spec');
require('../lib/popup.... |
<<<<<<<
fontWatcher.watch([], {}, true);
=======
fontWatcher.watchFonts([], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([], {}, true);
<<<<<<<
fontWatcher.watch([], {}, false);
=======
fontWatcher.watchFonts([], {}, FakeFontWatchRunner, false);
>>>>>>>
fontW... |
<<<<<<<
const { sendToLagoonLogs } = require('@lagoon/commons/src/logs');
const { createTaskTask } = require('@lagoon/commons/src/tasks');
const { pubSub, createEnvironmentFilteredSubscriber } = require('../../clients/pubSub');
const esClient = require('../../clients/esClient');
=======
>>>>>>>
const { sendToLagoonL... |
<<<<<<<
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true,
0, { 'My Other Family': true });
=======
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo,
{ 'My Other Family': true });
>>... |
<<<<<<<
FontRuler = webfont.FontRuler;
var domHelper = null,
=======
FontRuler = webfont.FontRuler,
domHelper = new DomHelper(window),
fontFamily = 'My Family',
fontDescription = 'n4';
var timesToCheckSizeBeforeChange = 0,
TARGET_SIZE = new Size(3, 3),
FALLBACK_SIZE_A =... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.