conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
incidences: 'boards',
'program-increment':'programIncrement',
=======
bugs: 'boards'
>>>>>>>
incidences: 'boards',
'program-increment':'programIncrement',
bugs: 'boards' |
<<<<<<<
let responseTimeTendency;
=======
let infraCost = 0;
let metricsMap = {};
>>>>>>>
let responseTimeTendency;
let infraCost = 0;
let metricsMap = {};
<<<<<<<
responseTimeTendency: responseTimeTendency,
errorsRateTendency: errorsRateTendency,
... |
<<<<<<<
notifications: new ServiceType(Timer.never, 'notifications')
=======
programincrement: new ServiceType(Timer.eventually, 'programincrement'),
>>>>>>>
programincrement: new ServiceType(Timer.eventually, 'programincrement'),
notifications: new ServiceType(Timer.never, 'notifications') |
<<<<<<<
bugs: 'boards',
notifications: 'slackTeam'
=======
incidences: 'boards',
'program-increment':'programIncrement',
bugs: 'boards'
>>>>>>>
incidences: 'boards',
'program-increment':'programIncrement',
bugs: 'boards',
notifications: 'slackTeam' |
<<<<<<<
var apply = function(value) {
doc.getSelection().removeAllRanges();
doc.getSelection().addRange(that._range);
that._actions(action, value);
that._range = doc.getSelection().getRangeAt(0);
}
=======
var apply = function(value) {
doc.getSelection().remo... |
<<<<<<<
const eosTypes = {
evt_address: ()=> [EvtAddress],
=======
const evtTypes = {
>>>>>>>
const evtTypes = {
evt_address: ()=> [EvtAddress], |
<<<<<<<
if (str === "0".repeat(50)) return Buffer.from([0, 0]);
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str);
buf = Buffer.concat([Buffer.from([1, 0]), new Buffer(base58.decode(str))]);
=======
if (str === "0".repeat(50)) return Buffer.from([0, 0]); // 0000
else if (str... |
<<<<<<<
if (str === "0".repeat(50)) return Buffer.from([0, 0]); // 0000
else if (str[0] === "0") return encodeGeneratedAddressToBin("EVT" + str); // generated address
let buf = Buffer.concat([Buffer.from([1, 0]), base58.decode(str)]); // normal
//console.log(buf)
=======
if (str === "0".repeat(50)... |
<<<<<<<
var revisionObj = queryUtils.snapshot(obj)
// TODO: use datastore plugin's internal fields
delete revisionObj._id
delete revisionObj.meta
delete revisionObj.$loki
=======
var revisionObj = _.clone(obj)
revisionObj._id = new ObjectID()
revisionObj.originalDocumentId = obj._id
>>>>>>>
var re... |
<<<<<<<
query.split("&").forEach(function(part) {
var item = part.split("=");
if (!result[item[0]]) {
result[item[0]] = [];
=======
query.forEach(function(part, i) {
if (i === 0 || i % 2 === 0) {
var key = part.replace(/&|=/g, '');
if (!result[key]) {
... |
<<<<<<<
var Controller = require(path.join(__dirname, '/controller'))
=======
var Controller = require(path.join(__dirname, '/controller'))
var HooksController = require(path.join(__dirname, '/controller/hooks'))
>>>>>>>
var Controller = require(path.join(__dirname, '/controller'))
var HooksController = require(path... |
<<<<<<<
/**
* Generate a folder hierarchy for a file, based on a configuration property
*
* @param {string} fileName - the name of the file being uploaded
*/
MediaController.prototype.getPath = function (fileName) {
var reSplitter
switch (config.get('media.pathFormat')) {
case 'sha1/4':
reSplitter = ... |
<<<<<<<
var Composer = require(path.join(__dirname, '/composer')).Composer
var config = require(path.join(__dirname, '/../../../config'))
var Connection = require(path.join(__dirname, '/connection'))
=======
var config = require(path.join(__dirname, '/../../../config'))
var connection = require(path.join(__dirname, '... |
<<<<<<<
$rootScope[config.user] = payload.user;
if (config.loginRedirect) {
$location.path(config.loginRedirect);
}
deferred.resolve(payload.user);
=======
$rootScope[config.user] = user;
$location.path(config.loginRedirect);
deferred.resolve(user);
... |
<<<<<<<
platform: 'browser',
=======
withCredentials: true,
>>>>>>>
withCredentials: true,
platform: 'browser',
<<<<<<<
},
platform: {
get: function() { return config.platform; },
set: function(value) { config.platform = value; }
=======
},
... |
<<<<<<<
},
tin: {
minFeatures: 1,
maxFeatures: 1,
description: 'Triangulated irregular network, interpolation method',
createsLayer: true
=======
},
bezier: {
minFeatures: 1,
description: 'Takes a line and returns a curved version by applying a Bezier... |
<<<<<<<
items: ['bezier', 'buffer', 'union', 'tin']
=======
items: ['buffer', 'center', 'centroid', 'envelope', 'union'] // Items in menu
>>>>>>>
items: ['bezier', 'buffer', 'center', 'centroid', 'envelope', 'union', 'tin'] |
<<<<<<<
},
icons: {
cwd: 'node_modules/geoglyphs/dist',
src: '**/*.svg',
dest: 'dist/icons',
expand: true
=======
},
assets: {
expand: true,
cwd: 'src/assets/',
src: ['*.*', '**/*.*'],
dest: 'dist/assets/'
>>>>>>>
},
... |
<<<<<<<
OmniScript.prototype.hashSObjectData = async function(input) {
var sobject = input.sobject;
if (sobject && sobject['%vlocity_namespace%__PropertySet__c']) {
sobject['%vlocity_namespace%__PropertySet__c'] = sobject['%vlocity_namespace%__PropertySet__c'].replace(/id=01.+?&/g, 'id=<SalesforceId>... |
<<<<<<<
"upgradeDataPackFields": Boolean,
"inlcudeDependencies": Boolean
=======
"upgradeDataPackFields": Boolean,
"testKeys": Array
>>>>>>>
"upgradeDataPackFields": Boolean,
"inlcudeDependencies": Boolean,
"testKeys": Array |
<<<<<<<
var version = this.vlocity.buildToolsVersionSettings[this.vlocity.namespace][i];
if (this.vlocity.PackageMajorVersion > version.PackageMajorVersion) {
this.vlocity.BuildToolSettingVersion = version.version;
break;
... |
<<<<<<<
"gitCheck": Boolean,
"checkStaleObjects": Boolean
=======
"gitCheck": Boolean,
"deleteSfdxProject": Boolean
>>>>>>>
"gitCheck": Boolean,
"checkStaleObjects": Boolean,
"deleteSfdxProject": Boolean
<<<<<<<
checkStaleObjects: {
name: 'CheckStaleObjects',
descript... |
<<<<<<<
for (var queryData of jobInfo.queries) {
=======
if (!jobInfo.fullManifest[queryData.VlocityDataPackType][record.Id]) {
if (jobInfo.specificManifestKeys
&& jobInfo.specificManifestKeys.indexOf(queryData.Vl... |
<<<<<<<
try {
if (this.vlocity.sessionId || this.vlocity.accessToken) {
await this.getNamespace();
} else if (this.vlocity.sfdxUsername) {
await this.sfdxLogin();
await this.getNamespace();
} else if (this.vlocity.username && this.vlocity.password) {
... |
<<<<<<<
jobInfo.errorHandling = jobInfo.errorHandling || {};
jobInfo.relationshipKeyToChildKeys = jobInfo.relationshipKeyToChildKeys || {};
=======
// Means that Continue or Retry will not work
if (jobInfo.jobAction == 'Continue' || jobInfo.jobAction == 'Retry') {
throw jobInfo.jobAction + ' ... |
<<<<<<<
await new Promise(resolve => setTimeout(resolve, 15000));
=======
await new Promise(resolve => setTimeout(resolve, 20000));
>>>>>>>
await new Promise(resolve => setTimeout(resolve, 20000));
<<<<<<<
=======
var dataPackType = dataJson.dataPacks[0... |
<<<<<<<
},
{
loader: 'style!css',
test: /\.css$/
},
{
loader: 'url',
test: /\.(eot|svg|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/
=======
},
{
loader: 'style!css',
test: /\.css$/
},
{
loader: 'file',
test: /\.png$/... |
<<<<<<<
{test: /\.json$/, loader: 'json', include: [path.resolve('src')]},
{test: /\.js$/, loaders: ['react-hot', babelLoader], include: [path.resolve('src')]}
=======
{test: /\.js$/, loader: 'babel', include: [path.resolve('src')]}
>>>>>>>
{test: /\.json$/, loader: 'json', include: [path.res... |
<<<<<<<
},
'AutoRemediateRds-006': {
'enabled': false
=======
},
'AutoRemediateRDS-006': {
'enabled': false
},
'AutoRemediateRDS-023': {
'enabled': false
}
'AutoRemediateKMS-004': {
'enabled': false
>>>>>>>
},
'AutoRemediateRds-006': {
'enabled': false
},
... |
<<<<<<<
connect(addr, cb)
}, 'string|object'),
=======
// look up the peer
var peer = u.find(peers, function (a) {
return (
addr.port === a.port
&& addr.host === a.host
&& addr.key === a.key
)
})
connect(peer, cb)
... |
<<<<<<<
var pull = require('pull-stream')
=======
var ssbKeys = require('ssb-keys')
var u = require('./util')
var toAddr = require('../lib/util').toAddress
>>>>>>>
var pull = require('pull-stream')
var ssbKeys = require('ssb-keys')
var u = require('./util')
var toAddr = require('../lib/util')... |
<<<<<<<
.use(require('./plugins/logging'))
.use(require('./plugins/replicate'))
=======
>>>>>>>
.use(require('./plugins/logging'))
.use(require('./plugins/replicate'))
<<<<<<<
.use(require('./plugins/logging'))
=======
.use(require('./plugins/friends'))
>>>>>>>
.use(requ... |
<<<<<<<
symbolUrl = "./images/pins/" + this.config.pushpinColor + ".png";
pictureMarkerSymbol = new PictureMarkerSymbol(symbolUrl, 36, 36).setOffset(10, 0);
=======
symbolUrl = "./images/pins/purple.png";
// create symbol and offset 10 to the left and 17 to the bottom s... |
<<<<<<<
var isWindows = /Windows /.test(navigator.userAgent); // Windows (8.1)
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
var isIE = isWindows || isWP8;
var isWebKit = !isIE; // TBD [Android or iOS]
// NOTE: In the core-master branch there is no difference between the default
// implementation ... |
<<<<<<<
var isAndroid = !isWindows && /Android/.test(navigator.userAgent);
// The following openDatabase settings are used for Plugin-implementation-2
// on Android:
// - androidDatabaseImplementation: 2
// - androidLockWorkaround: 1
=======
// NOTE: While in certain version branches there is no difference between
... |
<<<<<<<
if (!readTransactionFinished) {
SelfTest.finishWithError(errorcb, 'readTransaction did not finish');
return;
}
return db.transaction(function(tx3) {
tx3.executeSql('DELETE FROM TestTable');
re... |
<<<<<<<
=======
// FUTURE TODO replace in test(s):
function ok(test, desc) { expect(test).toBe(true); }
function equal(a, b, desc) { expect(a).toEqual(b); } // '=='
function strictEqual(a, b, desc) { expect(a).toBe(b); } // '==='
// XXX TODO REFACTOR OUT OF OLD TESTS:
var wait = 0;
var test_it_done = null;
function ... |
<<<<<<<
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'l', 'm3', 'km3', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal', 'ft3', 'yd3', 'ea', 'C', 'K', 'F', 'ms', 's', 'min', 'h... |
<<<<<<<
, expected = [ 'mm', 'cm', 'm', 'km', 'in', 'yd', 'ft', 'mi', 'mm2', 'cm2', 'm2', 'ha', 'km2', 'in2', 'ft2', 'ac', 'mi2', 'mcg', 'mg', 'g', 'kg', 'oz', 'lb', 'mm3', 'cm3', 'ml', 'cl', 'dl', 'l', 'm3', 'km3', 'krm', 'tsk', 'msk', 'kkp', 'glas', 'kanna', 'tsp', 'Tbs', 'in3', 'fl-oz', 'cup', 'pnt', 'qt', 'gal'... |
<<<<<<<
var ie = /msie/i.test(navigator.userAgent),
px = 'px',
rgbOhex = /^rgb\(|#/,
=======
var px = 'px',
>>>>>>>
var px = 'px',
rgbOhex = /^rgb\(|#/, |
<<<<<<<
const google = require('googleapis');
const GCal = require('./src/gcal');
const path = require('path');
=======
const gcal = require('./src/gcal');
>>>>>>>
const google = require('googleapis');
const gcal = require('./src/gcal');
const path = require('path'); |
<<<<<<<
title: 'Circle',
uid: 'circle',
},
{
=======
title: 'Clusterer',
uid: 'clusterer',
},
{
>>>>>>>
title: 'Circle',
uid: 'circle',
},
{
title: 'Clusterer',
... |
<<<<<<<
const icon = argv.icon || argv.i || 'build/icon';
if (icon) {
DEFAULT_OPTS.icon = icon;
}
=======
const icon = argv.icon || argv.i || 'app/app';
if (icon) DEFAULT_OPTS.icon = icon;
>>>>>>>
const icon = argv.icon || argv.i || 'build/icon';
if (icon) DEFAULT_OPTS.icon = icon; |
<<<<<<<
// Expose the global `gh` variable, through which every API method is
// accessed, but keep a local variable around so we can reference it easily.
=======
// Get around how the GH team haven't migrated all the API to version 2, and
// how gists use a different api root.
withTempApiRoot = f... |
<<<<<<<
'dojo/text!phpr/template/bookingList/bookingCreator.html',
'phpr/ProjectChooser',
'dijit/form/Textarea',
'dijit/form/ValidationTextBox',
'phpr/DateTextBox',
'dijit/form/Form'
], function(
declare,
lang,
array,
on,
number,
all,
topic,
json,
topic,
J... |
<<<<<<<
'dojo/dom-construct',
=======
'dojo/json',
'dojo/io-query',
>>>>>>>
'dojo/dom-construct',
'dojo/json',
'dojo/io-query',
<<<<<<<
'phpr/Statistics/WorktimeMonthTable',
'phpr/ProjectChooser',
'dijit/layout/ContentPane'
=======
'phpr/Statistics/WorktimeMonthTable',
... |
<<<<<<<
this._currentTarget = null;
this._opacityDirty = true;
this._sizeDirty = true;
this._originDirty = true;
this._transformDirty = true;
this._isVisible = true;
=======
>>>>>>>
this._currentTarget = null;
this._opacityDirty = true;
this.... |
<<<<<<<
events : {},
initialize : function initialize(){
this.ratios = new Transitionable(this.options.ratios);
this.nodes = [];
var stateStream = Stream.lift(
function(ratios, parentSize){
var direction = this.options.direction;
... |
<<<<<<<
exports.sound = function(filename, callback){
//sys.puts('playing'.grey + ' -> '.yellow + filename.toString().magenta);
player.play(filename);
/*
var commands = [text];
var childD = spawn("afplay", commands);
childD.stdout.setEncoding('ascii');
childD.stderr.setEncoding('ascii');... |
<<<<<<<
<Link
to={`/blog/author/${author._id}`}
className="text-primary font-bold no-underline hover:underline"
>
{author.name}
</Link>
=======
{author && author.name ? (
<Link
... |
<<<<<<<
function add(file, cb) {
var cwd = opt.cwd || file.cwd;
var cmd = "git add " + escape([file.path]) + " " + opt.args;
exec(cmd, {cwd: cwd}, function(err, stdout, stderr){
if(err) cb(err);
=======
function add(file, enc, cb) {
var that = this;
var cmd = "git add " + opt.args + " "... |
<<<<<<<
<div class="flex justify-between mt-1 mb-1">
<PageHeader>
<IconButton className="cursor-pointer" onClick={this.handleBack} aria-label="Back">
<BackIcon />
</IconButton> Subscribe Details</PageHeader>
</div>
=======
<Helmet>
<title> Subscribe... |
<<<<<<<
path: '/admin/content-manage/edit/:id',
name: 'Content Manage',
component: ContentManageAddEdit,
},
{
=======
path: '/admin/role-manage/add',
name: 'Role Manage',
component: RoleManageEditPage,
exact: true,
},
{
>>>>>>>
path: '/admin/content-manage/edit/:id',
name:... |
<<<<<<<
import Dashboard from '@material-ui/icons/Dashboard';
import DashboardPage from '../containers/Dashboard';
import ContentManagePage from '../containers/ContentListingPage';
=======
import DashboardPage from '../containers/AdminDashboard';
>>>>>>>
import Dashboard from '@material-ui/icons/Dashboard';
import... |
<<<<<<<
import MediaManagePage from '../containers/AdminMediaManagePage/Loadable';
=======
import SliderManagePage from '../containers/SliderManagePage/Loadable';
import SliderManageAddEdit from '../containers/SliderManagePage/AddEditPage/Loadable';
>>>>>>>
import MediaManagePage from '../containers/AdminMediaManag... |
<<<<<<<
field: 'gender',
validate: [
{
condition: 'IsEmpty',
msg: userConfig.validationMessage.genderRequired,
},
{
condition: 'Contains',
msg: userConfig.validationMessage.genderInvalid,
options: ['Male', 'Female', 'Other'],
... |
<<<<<<<
<div className="flex justify-between mt-3 mb-3">
=======
<Helmet>
<title>User Listing</title>
</Helmet>
>>>>>>>
<Helmet>
<title>User Listing</title>
</Helmet>
<div className="flex justify-between mt-3 mb-3">
<<<<<<<
<Fab
... |
<<<<<<<
import StaticContentDiv from '../../components/StaticContentDiv';
=======
import mainImage from './home.png';
>>>>>>>
import StaticContentDiv from '../../components/StaticContentDiv';
import mainImage from './home.png';
<<<<<<<
<h1>
<FormattedMessage {...messages.header} />
<StaticCont... |
<<<<<<<
import WECkEditior from '../../../../components/CkEditor';
import Input from '../../../../components/customComponents/Input';
import SaveAltIcon from '@material-ui/icons/SaveAlt';
=======
import WECkEditior from '../../../../components/CkEditor';
>>>>>>>
import WECkEditior from '../../../../components/CkEdit... |
<<<<<<<
<PageContent>
<div class="w-full md:w-1/2 pb-4">
<label class="block uppercase tracking-wide text-grey-darker text-xs mb-2" for="grid-last-name">
Slider Name
</label>
<input class="Waftinputbox" id="slider-name" type="text" value= {one.slider_name} name="slider_name"
... |
<<<<<<<
import MediaManagePage from '../containers/AdminMediaManagePage/Loadable';
=======
import SliderManagePage from '../containers/SliderManagePage/Loadable';
import SliderManageAddEdit from '../containers/SliderManagePage/AddEditPage/Loadable';
>>>>>>>
import MediaManagePage from '../containers/AdminMediaManag... |
<<<<<<<
//data[field] = !isEmpty(data[field]) ? data[field] : '';
// console.log(field);
// console.log(field.split('.').length);
//console.log(`loop ${i}: `, data);
if (field && field.split('.').length > 1) {
for (let k = 0; k < field.split('.').length; k++) {
// console.log(data);
... |
<<<<<<<
import Logo from '../../images/logo.png';
=======
import SliderIcon from '@material-ui/icons/Slideshow';
>>>>>>>
import Logo from '../../images/logo.png';
import SliderIcon from '@material-ui/icons/Slideshow'; |
<<<<<<<
<div class="flex justify-between mt-1 mb-1">
=======
<Helmet>
<title>
{match && match.params && match.params.id
? 'Edit Blog'
: 'Add Blog'}
</title>
</Helmet>
>>>>>>>
<Helmet>
<title>
{match && ma... |
<<<<<<<
import React from "react";
import { compose } from "redux";
import { connect } from "react-redux";
import classNames from "classnames";
import { createStructuredSelector } from "reselect";
=======
import React from 'react';
import { compose } from 'redux';
import { connect } from 'react-redux';
import classN... |
<<<<<<<
let update = await LeaveTypeModel.findByIdAndUpdate(LeaveType._id, {
$set: LeaveType
});
return otherHelper.sendResponse(
res,
HttpStatus.OK,
true,
update,
null,
"Leave Type Saved Success !!",
null
);
=======
let upd... |
<<<<<<<
<div className="flex justify-between mt-3 mb-3">
=======
<Helmet>
<title>FAQ Listing</title>
</Helmet>
>>>>>>>
<Helmet>
<title>FAQ Listing</title>
</Helmet>
<div className="flex justify-between mt-3 mb-3"> |
<<<<<<<
};
/* prompt */
Selenium.prototype.doChooseCancelOnNextPrompt = function() {
return this.browserbot.cancelNextPrompt();
}
Selenium.prototype.doAnswerOnNextPrompt = function (answer) {
return this.browserbot.setNextPromptResult(answer);
}
Selenium.prototype.doAssertPrompt = function (message) {
r... |
<<<<<<<
import DeleteDialog from '../../components/DeleteDialog';
=======
import Loading from '../../components/loading';
>>>>>>>
import DeleteDialog from '../../components/DeleteDialog';
import Loading from '../../components/loading'; |
<<<<<<<
LeaveName: "",
LeaveNameNepali: "",
ApplicableGender: "Female",
=======
LeaveName: '',
ApplicableGender: 'Female',
>>>>>>>
LeaveName: '',
LeaveNameNepali: '',
ApplicableGender: 'Female',
<<<<<<<
NoOfDays: null,
ApplicableReligion: "",
IsCarryOver: ""
=======
... |
<<<<<<<
import DeleteDialog from '../../components/DeleteDialog';
=======
import Loading from '../../components/loading';
>>>>>>>
import DeleteDialog from '../../components/DeleteDialog';
import Loading from '../../components/loading'; |
<<<<<<<
ltrim: true
}
}
// {
// field: "IsActive",
// sanitize: {
// rtrim: true,
// toBoolean: true
// }
// }
=======
ltrim: true,
},
},
>>>>>>>
ltrim: true
}
}
<<<<<<<
option: { min: 4, max: 10 }
},
... |
<<<<<<<
import DashboardPage from '../containers/AdminDashboard/Loadable';
import RoleManagePage from '../containers/AdminRoleManage/Loadable';
import RoleManageEditPage from '../containers/AdminRoleManage/AddEditPage';
=======
import Dashboard from '@material-ui/icons/Dashboard';
import ContentManagePage from '../co... |
<<<<<<<
that.clear = function () {
// Clear the environment's node list.
that.nodes.length = 0;
// And clear out all named nodes.
var nodeNames = Object.keys(that.namedNodes),
i,
nodeName;
for (i = 0; i < nodeNames.len... |
<<<<<<<
// For companydepartments
const departmentroutes = require('./api/department');
router.use('/department', departmentroutes);
=======
// For Branch
const BranchRoutes = require('./api/Branch');
router.use('/Branch', BranchRoutes);
>>>>>>>
// For companydepartments
const departmentroutes = require('./api/dep... |
<<<<<<<
}, {
code: [
'var Hello = React.createClass({',
' propTypes: {',
' firstname: CustomValidator.string',
' },',
' render: function() {',
' return <div>{this.props.firstname}</div>;',
' }',
'});'
].join('\n'),
args: [1,... |
<<<<<<<
return <Component ref={typicalRef} className={classNames.join(' ')}/>;
}
=======
return <Component ref={typicalRef} className={styles.typicalWrapper}/>;
}
export default memo(Typical)
>>>>>>>
return <Component ref={typicalRef} className={classNames.join(' ')}/>;
}
export default memo(Typical) |
<<<<<<<
var params = {
apiVersion: '1.1',
path: '/sites/' + this._sid + '/media/' + this._id
};
this.wpcom.sendRequest(params, query, null, fn);
=======
var path = '/sites/' + this._sid + '/media/' + this._id;
return this.wpcom.sendRequest(path, query, null, fn);
>>>>>>>
var params = {
apiVe... |
<<<<<<<
/*
Used in by the Creep method "display stats" to
support constantly updated hp for the specific
selected creep. Conceivably one might move into
another state immediately without transitioning
into normal state before that. Preferably some
kind of state cleanup function will be added to
the state ... |
<<<<<<<
var substitutions = require("./substitutions");
=======
/**
* @constructor
* @param {Object} config the configuration of the bridge.
* See ../config/slack-config-schema.yaml for the schema to which this must conform.
* @param {Rooms} rooms mapping of all known slack channels to matrix rooms.
* @para... |
<<<<<<<
const Datastore = require('nedb');
=======
const path = require("path");
>>>>>>>
const Datastore = require('nedb');
const path = require("path"); |
<<<<<<<
var substitutions = require("./substitutions");
=======
const log = require("matrix-appservice-bridge").Logging.get("SlackGhost");
>>>>>>>
const substitutions = require("./substitutions");
const log = require("matrix-appservice-bridge").Logging.get("SlackGhost"); |
<<<<<<<
var Promise = require('bluebird');
var bridgeLib = require("matrix-appservice-bridge");
var Bridge = bridgeLib.Bridge;
var Metrics = bridgeLib.PrometheusMetrics;
var StateLookup = bridgeLib.StateLookup;
var SlackHookHandler = require("./SlackHookHandler");
var BridgedRoom = require("./BridgedRoom");
var Slack... |
<<<<<<<
=======
gridSettings[SETTINGS_IGNORE_PANEL] = false; //Set this to true if you have the top panel hidden
>>>>>>>
gridSettings[SETTINGS_IGNORE_PANEL] = false; //Set this to true if you have the top panel hidden
<<<<<<<
let offsetY = (isPrimaryMonitor(monitor)) ? Main.panel.actor.height : 0;
... |
<<<<<<<
logout: require('./commands/logout'),
=======
login: require('./commands/login'),
>>>>>>>
logout: require('./commands/logout'),
login: require('./commands/login'), |
<<<<<<<
const pkg = require('../package.json');
const {
DEBUG,
LAMBDA_VERSION,
UPDATE_NOTIFICATION_INTERVAL
} = require('./constants');
=======
const { LAMBDA_VERSION, UPDATE_NOTIFICATION_INTERVAL } = require('./constants');
>>>>>>>
const pkg = require('../package.json');
const { LAMBDA_VERSION, UPDATE_NOTIF... |
<<<<<<<
describe: require('./describe'),
help: require('./help')
=======
help: require('./help'),
link: require('./link')
>>>>>>>
help: require('./help') |
<<<<<<<
hide: true
}
},
firehoseWebhooks: {
description:
'**INTERNAL USE ONLY**. Zapier uses this for internal webhook app configurations.',
$ref: FirehoseWebhookSchema.id,
docAnnotation: {
hide: true
}
}
=======
hide: t... |
<<<<<<<
describe: require('./describe'),
help: require('./help'),
link: require('./link')
=======
convert: require('./convert'),
help: require('./help')
>>>>>>>
help: require('./help') |
<<<<<<<
var xmlHttp = new XMLHttpRequest()
xmlHttp.open('GET', chrome.extension.getURL('lib/hibernationPage/index.html'), true)
xmlHttp.onreadystatechange = function () {
if (xmlHttp.readyState === 4) {
var html = xmlHttp.responseText
sleepTab(html, tab, 100)
}
}
xmlHttp.send(null)
})
=======
var xmlH... |
<<<<<<<
var GCC = process.env['CC'] || 'gcc';
var LOG_LEVEL = process.env['Log_LEVEL'] || 'DEBUG';
=======
var GCC = process.env['CC'];
if (!GCC) {
if (SYSTEM === 'freebsd') {
GCC = 'gcc47';
} else {
GCC = 'gcc';
}
}
var BUILDDIR = process.env['BUILDDIR'];
if (BUILDDIR === undefined) {
... |
<<<<<<<
GiftedAvatar,
=======
utils
>>>>>>>
GiftedAvatar,
utils |
<<<<<<<
import {setLocale} from './Locale';
import _ from 'lodash';
=======
import deepEqual from 'deep-equal';
>>>>>>>
import {setLocale} from './Locale';
import deepEqual from 'deep-equal'; |
<<<<<<<
/*! Flocking 0.1.0 (March 24, 2014), Copyright 2014 Colin Clark | flockingjs.org */
=======
/*! Flocking 0.1.0 (March 28, 2014), Copyright 2014 Colin Clark | flockingjs.org */
>>>>>>>
/*! Flocking 0.1.0 (March 28, 2014), Copyright 2014 Colin Clark | flockingjs.org */
<<<<<<<
=======
/**
... |
<<<<<<<
case "ordinal-time":
ordinalTimeAxis(axisNode, obj, scale, axis, axisSettings);
break;
=======
case "ordinal-time":
ordinalTimeAxis(axisNode, obj, scale, axis, axisSettings);
break;
>>>>>>>
case "ordinal-time":
ordinalTimeAxis(axisNode, obj, scale, axis, axisSetting... |
<<<<<<<
require('./reconnect');
=======
require('./events');
>>>>>>>
require('./reconnect');
require('./events'); |
<<<<<<<
constructor: Array,
every: require('./every')(Array.prototype.every),
fill: require('./fill')(Array.prototype.fill),
filter: require('./filter')(Array.prototype.filter),
forEach: require('./forEach')(Array.prototype.forEach),
map: require('./map')(Array.prototype.map),
reduce: requir... |
<<<<<<<
=======
updatePosition = throttle(() => {
const {desktop} = this.state
if (!desktop) return
const {pageYOffset, innerHeight} = window
const {offsetHeight, offsetTop} = this.rootNode
if (offsetHeight >= document.body.clientHeight) return
let position
let top
if (
(this.p... |
<<<<<<<
export * as SideNav from './SideNav'
export Hint from './Hint'
=======
export * as SideNav from './SideNav'
export Textarea from './Textarea'
>>>>>>>
export * as SideNav from './SideNav'
export Hint from './Hint'
export Textarea from './Textarea' |
<<<<<<<
webpack: {
=======
webpack: { //kind of a copy of your webpack config
devtool: 'inline-source-map',
>>>>>>>
webpack: {
devtool: 'inline-source-map', |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.