conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
output = "> " + fromUser + " sends karma to " + toUserMessage;
=======
output = "> " + fromUser + " sends brownie points to " + toUser;
>>>>>>>
output = "> " + fromUser + " sends brownie points to " + toUserMessage;
<<<<<<<
=======
var apiPath = `/api/users/give-brownie-po... |
<<<<<<<
extensions: ['.ts', '.js', '.tsx', '.scss']
=======
extensions: ['.ts', '.tsx', '.scss'],
alias: {
tslib: path.join(__dirname, './src/entries/chunks/helpers.ts'),
}
>>>>>>>
extensions: ['.ts', '.js', '.tsx', '.scss'],
al... |
<<<<<<<
work: function (font_id, glyphs) {
=======
work: function (font_id, config, user) {
>>>>>>>
work: function (font_id, config) {
<<<<<<<
glyphs: glyphs
=======
fontname: config.font.fontname,
glyphs: config.glyphs,
user: user
>>>>>>>
fontname: config.fo... |
<<<<<<<
// const SvgPath = require('svgpath');
=======
const ttf2eot = require('ttf2eot');
const ttf2woff = require('ttf2woff');
const wawoff2 = require('wawoff2');
>>>>>>>
<<<<<<<
const jade = require('jade');
=======
const pug = require('pug');
const b64 = require('base64-js');
>>>>>>>
... |
<<<<<<<
"lastUpdated": "2019-12-24 03:39:37"
=======
"lastUpdated": "2019-12-24 01:55:44"
>>>>>>>
"lastUpdated": "2019-12-24 07:35:29"
<<<<<<<
// var items = getItemsFromSearchResults(doc, url);
=======
>>>>>>>
<<<<<<<
} else if (url.match(/kns\/brief\/(Default_Result|result)\.aspx/i)) {
=======
} else ... |
<<<<<<<
"display/shape.js",
=======
"display/mapsprite.js",
>>>>>>>
"display/shape.js",
"display/mapsprite.js", |
<<<<<<<
describe('window.webContents.send(channel, args...)', function() {
it('throws an error when the channel is missing', function() {
assert.throws(function() {
w.webContents.send();
}, 'Missing required channel argument');
assert.throws(function() {
w.webContents.send(null... |
<<<<<<<
assert.deepEqual(message.storageItems, {foo: 'bar'})
=======
assert.equal(message.tabId, w.webContents.id)
assert.equal(message.i18nString, 'foo - bar (baz)')
>>>>>>>
assert.equal(message.tabId, w.webContents.id)
assert.equal(message.i18nString, 'fo... |
<<<<<<<
/*! angular-bootstrap-show-errors (version 1.0.2) 2014-09-10 */
(function(){angular.module("ui.bootstrap.showErrors",[]).directive("showErrors",["$timeout",function(a){var b;return b=function(b,c,d,e){var f,g,h,i;if(f=!1,g=c[0].querySelector("[name]"),i=angular.element(g),h=i.attr("name"),!h)throw"show-errors e... |
<<<<<<<
function createEntry(node, lang) {
=======
// Matches characters outside of the Latin-1 character set
var nonLatin1 = /[^\x01-\xFF]/;
// Unicode bidi isolation characters
var FSI = '\u2068';
var PDI = '\u2069';
function createEntry(node, env) {
>>>>>>>
// Matches characters outside of the Latin-1 character... |
<<<<<<<
/* global Env, io */
/* global translateFragment, translateElement */
=======
/* global Locale, Context, L10nError, Resolver, PropertiesParser */
/* global getPluralRule, rePlaceables */
/* global translateDocument, io */
/* global translateFragment, localizeElement, translateElement */
>>>>>>>
/* global Env... |
<<<<<<<
import FTLParser from '../../lib/format/ftl/ast/parser';
import {default as FTLEntriesParser } from '../../lib/format/ftl/entries/parser';
=======
import FTLASTParser from '../../lib/format/ftl/ast/parser';
>>>>>>>
import FTLASTParser from '../../lib/format/ftl/ast/parser';
import {default as FTLEntriesParse... |
<<<<<<<
const val = bundle.formatPattern(msg.value, args, errs);
assert.equal(val, 'MISSING()');
=======
const val = bundle.format(msg, args, errs);
assert.equal(val, '{MISSING()}');
>>>>>>>
const val = bundle.formatPattern(msg.value, args, errs);
assert.equal(val, '{MISSING()}'); |
<<<<<<<
var ctx = l10n.require(['pl'], [path('fixtures/{locale}.properties')]);
ctx.ready.then(function(supported) {
=======
var ctx = l10n.createContext([path('fixtures/{locale}.properties')]);
ctx.ready.then(function(supported) {
>>>>>>>
var ctx = l10n.createContext(
['pl'], [... |
<<<<<<<
this.ctx = this.env.require(langs, this.resources);
return this.ctx.ready.then(translateDocument.bind(this));
=======
return this.env.requestLanguages(langs).then(
translateDocument.bind(this));
>>>>>>>
this.ctx = this.env.createContext(langs, this.resources);
return this.ctx.ready.... |
<<<<<<<
const val = bundle.formatPattern(msg.value, {}, errs);
assert.equal(val, '$arg');
=======
const val = bundle.format(msg, {}, errs);
assert.equal(val, '{$arg}');
>>>>>>>
const val = bundle.formatPattern(msg.value, {}, errs);
assert.equal(val, '{$arg}');
<<<<<<<
const... |
<<<<<<<
import { prioritizeLocales } from '../../intl/locale';
import { valueFromContext } from '../../lib/format';
import { ChromeLocalizationObserver } from '../../bindings/observer/chrome';
import { XULLocalization, contexts } from '../../bindings/dom/xul';
import { ResourceBundle } from './resourcebundle';
import... |
<<<<<<<
const val = bundle.formatPattern(msg.value, {}, errs);
assert.equal(val, "Foo $arg");
=======
const val = bundle.format(msg, {}, errs);
assert.equal(val, "Foo {$arg}");
>>>>>>>
const val = bundle.formatPattern(msg.value, {}, errs);
assert.equal(val, "Foo {$arg}");
<<<<<<<... |
<<<<<<<
"arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole",
"arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess",
{"Ref":"EsPolicy"},
=======
{"Ref":"QueryPolicy"},
>>>>>>>
"arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole",
... |
<<<<<<<
"PublicOrPrivate",
"XraySetting"
=======
"ElasticSearchNodeCount",
"PublicOrPrivate"
>>>>>>>
"ElasticSearchNodeCount",
"PublicOrPrivate",
"XraySetting" |
<<<<<<<
});
app.del('/', function(req, res, next) {
return res.clearCookie('token').send(200);
=======
signin(req, res, next);
});
function signin(req, res, next) {
auth(req.body.email, req.body.password, function (err, user, info) {
if (err) {
return res.json(200, { error: t(err.message) });
}... |
<<<<<<<
'.gm_room_list': {
'list-style': 'none',
'text-align': 'left',
'font-size': '11px',
'column-count': '3',
'-moz-column-count': '3',
'-webkit-column-count': '3'
},
'.gm_room_list li a': {
'display': 'block'... |
<<<<<<<
// @include http://chat.meta.stackoverflow.com/rooms/*
// @include http://chat.stackexchange.com/rooms/*
// @include http://chat.stackoverflow.com/rooms/*
// @include http://chat.superuser.com/rooms/*
// @include http://chat.serverfault.com/rooms/*
// @include http://ch... |
<<<<<<<
'39': function (target) {
return target.closest('.monologue').hasClass('mine') ? 'edit' : 'reply';
=======
'37': {
command: 'peek',
jump: false
},
'39': {
command: function (target) {
return target.closest('.monologue').hasClass('mine') ? 'edit' : 'reply';
},
jump: tru... |
<<<<<<<
var AuthInfo = require('./authinfo').AuthInfo;
var blobClient = require('./blob').BlobClient;
var crypt = require('./crypt').Crypt;
=======
var async = require('async');
var blobClient = require('./blob');
var AuthInfo = require('./authinfo').AuthInfo;
var crypt = require('./crypt').Crypt;... |
<<<<<<<
var crypt = require('./crypt').Crypt;
var request = require('superagent');
var async = require('async');
var extend = require("extend");
var BlobClient = {};
=======
var request = require('superagent');
var extend = require('extend');
var crypt = require('./crypt').Crypt;
>>>>>>>
var crypt = require... |
<<<<<<<
var sjcl = require('./utils').sjcl;
var base = require('./base').Base;
var UInt160 = require('./uint160').UInt160;
var message = require('./message');
var request = require('superagent');
var extend = require("extend");
var parser = require("url");
var Crypt = {};
=======
var parser = requi... |
<<<<<<<
// .then(fontsPromise.bind(null, mod, conf.modulePath, conf.appPath))
=======
>>>>>>> |
<<<<<<<
value = (value * advance) + callDateMethod(date, 'get', false, method);
=======
value = (value * advance) + callDateMethod(date, 'get', '', method);
} else if(unit === 'month' && paramExists('day')) {
// When setting the month, there is a chance that we will traverse into a new m... |
<<<<<<<
defineStaticPolyfill(sugarArray, {
=======
function getCoercedObject(obj) {
if (obj == null) {
throw new TypeError('Object required.');
}
return coercePrimitiveToObject(obj);
}
defineStaticPolyfill(Array, {
>>>>>>>
function getCoercedObject(obj) {
if (obj == null) {
thr... |
<<<<<<<
import AdminEventsSection from './components/AdminEventsSection';
import AdminEventUploadRsvps from './components/AdminEventUploadRsvps';
import ConstituentLookup from './components/ConstituentLookup';
import AdminCallAssignmentsSection from './components/AdminCallAssignmentsSection';
import AdminCallAssignment... |
<<<<<<<
filters: {flagApproval: true},
hostFilters: {}
},
=======
filters: {flagApproval: true}
}
if (hashParams.query){
try {
let newQueryParams = Object.assign({}, defaultParams, hashParams.query)
newQueryParams.filters = Object.assign({}, defaultParams.filters, hashParams.query.fi... |
<<<<<<<
filterOptions: {type: GraphQLEventInput },
hasHostMessages: {type: GraphQLBoolean},
=======
eventFilterOptions: {type: GraphQLEventInput },
hostFilterOptions: {type: GraphQLPersonInput },
>>>>>>>
eventFilterOptions: {type: GraphQLEventInput },
hasHostMessages: ... |
<<<<<<<
function activeCallAssignments(query) {
return query
.where('end_dt', '>', moment().add(1, 'days').toDate())
.orWhere('end_dt', null)
}
function inactiveCallAssignments(query) {
return query
.where('end_dt', '<', moment().add(1, 'days').toDate())
}
function interpretDateAsUTC(date) {
return ... |
<<<<<<<
{value: 1, 'text': 'Pending Approval'},
{value: 0, 'text': 'Approved Events'},
{value: 2, 'text': 'FastFwd Requests'}
=======
{value: 'PENDING_APPROVAL', 'text': 'Pending Approval'},
{value: 'PENDING_REVIEW', 'text': 'Pending Review'},
{value: 'APPROVED', 'text': 'Public Ev... |
<<<<<<<
=======
app.post('/logout',
wrap(async (req, res) => {
req.logout();
res.send('Success!')
}))
// this endpoint is for testing email rendering/sending
app.get('/events/confirmation-email', wrap(async (req, res) => {
let event_types = await BSDClient.getEventTypes();
let result = await Mailgun.sendEv... |
<<<<<<<
constructor(forum) {
=======
constructor () {
>>>>>>>
constructor () {
<<<<<<<
this.setForum(forum);
=======
>>>>>>>
<<<<<<<
url(path = 'all') {
const forum = this.forum ? `forum=${this.forum}` : ''
return `/api/topic/${path}?${forum}`;
=======
url (id, forumName) {
if (!fo... |
<<<<<<<
let aliceLocator = padAddressToLocator(aliceAddress)
let bobLocator = padAddressToLocator(bobAddress)
const MIN_STAKE_250 = 250
const MIN_STAKE_500 = 500
=======
>>>>>>>
let aliceLocator = padAddressToLocator(aliceAddress)
let bobLocator = padAddressToLocator(bobAddress)
<<<<<<<
await set... |
<<<<<<<
indexer = await Indexer.new(tokenAST.address, 200, EMPTY_ADDRESS, {
from: ownerAddress,
})
=======
indexer = await Indexer.new(tokenAST.address, { from: ownerAddress })
>>>>>>>
indexer = await Indexer.new(tokenAST.address, EMPTY_ADDRESS, {
from: ownerAddress,
})
... |
<<<<<<<
let tx = await delegateFactory.createDelegate(tradeWalletOne, {
from: delegateOwnerOne,
})
=======
const tx = await delegateFactory.createDelegate(
delegateOwnerOne,
tradeWalletOne
)
>>>>>>>
const tx = await delegateFactory.createDelegate(tradeWalletOne, ... |
<<<<<<<
describe('Swaps (Fungible)', async () => {
let _order
before(
'Alice creates an order for Bob (200 AST for 50 DAI)',
async () => {
_order = await orders.getOrder({
signer: {
wallet: aliceAddress,
token: tokenAST.address,
... |
<<<<<<<
const mockRegistry = accounts[5]
=======
const PROTOCOL = '0x0001'
>>>>>>>
const mockRegistry = accounts[5]
const PROTOCOL = '0x0001' |
<<<<<<<
.then(() => deployer.deploy(Indexer, FungibleToken.address, 250, EMPTY_ADDRESS))
=======
.then(() => deployer.deploy(Indexer, FungibleToken.address))
>>>>>>>
.then(() => deployer.deploy(Indexer, FungibleToken.address, EMPTY_ADDRESS)) |
<<<<<<<
exports.setup = function(svc, loggedOutSvc) {
var splunkjs = require('../splunk');
=======
exports.setup = function(svc) {
var splunkjs = require('../index');
>>>>>>>
exports.setup = function(svc, loggedOutSvc) {
var splunkjs = require('../index');
<<<<<<<
"Properties Tests": { ... |
<<<<<<<
yield put(notify('error', e.error.details[0].message));
=======
yield put(signUp.failure(new SubmissionError({ _error: e.error.details[0].message })));
yield call([Toast, Toast.red], { message: e.error.details[0].message });
>>>>>>>
yield call([Toast, Toast.red], { message: e.error.de... |
<<<<<<<
case 'SET_PEN_UP_HEIGHT':
return {...state, penUpHeight: action.value}
case 'SET_PEN_DOWN_HEIGHT':
return {...state, penDownHeight: action.value}
case 'SET_RESOLUTION':
return {...state, resolution: action.value}
case 'SET_PAPER_SIZE':
const landscape = action.size.size.x... |
<<<<<<<
const expressPath = path.join(cwdPath, options.expressPath)
chokidar
=======
const expressPath = cwdPath + options.expressPath
const watcher = chokidar
>>>>>>>
const expressPath = path.join(cwdPath, options.expressPath)
const watcher = chokidar |
<<<<<<<
mongoUrl: env.MONGOHQ_URL,
mongoUsersUrl: env.MONGO_USERS_URL,
=======
mongoUrl: env.MONGO_URI ? env.MONGO_URI : (env.MONGO_URL ? env.MONGO_URL : env.MONGOHQ_URL),
>>>>>>>
mongoUrl: env.MONGO_URI ? env.MONGO_URI : (env.MONGO_URL ? env.MONGO_URL : env.MONGOHQ_URL),
mongoUsersUrl: env.MONGO_USERS_URL... |
<<<<<<<
}
=======
zoomend: this._zoomEnd // reset the gl map view at the end of a zoom
};
>>>>>>>
}; |
<<<<<<<
server.use(prerender.basicAuth());
=======
server.use(prerender.sendPrerenderHeader());
// server.use(prerender.basicAuth());
>>>>>>>
server.use(prerender.basicAuth());
server.use(prerender.sendPrerenderHeader()); |
<<<<<<<
static isRegisteredForRemoteNotifications() {
return NativeRNNotifications.isRegisteredForRemoteNotifications();
}
static checkPermissions() {
return NativeRNNotifications.checkPermissions();
}
=======
/**
* Remove all delivered notifications from Notification Center
*/
static rem... |
<<<<<<<
deviceRemoveEventListener,
nativeAppAddEventListener,
nativeAppRemoveEventListener,
nativeRequestPermissionsWithCategories,
nativeAbandonPermissions,
nativeRegisterPushKit,
nativeBackgroundTimeRemaining,
nativeConsumeBackgroundQueue,
nativeLocalNotification,
nativeCancelL... |
<<<<<<<
this._boundedEventHandlers = {};
=======
this.id = HotelDatepicker.getNewId();
>>>>>>>
this._boundedEventHandlers = {};
this.id = HotelDatepicker.getNewId();
<<<<<<<
HotelDatepicker.prototype.addBoundedListener = function addBoundedListener (node, event, handler, capture) {
if (!(node in this._bound... |
<<<<<<<
this.input = input;
input.setAttribute("aria-autocomplete", "list");
=======
this.input = $(input);
this.input.setAttribute("aria-autocomplete", "list");
>>>>>>>
this.input = $(input);
this.input.setAttribute("aria-autocomplete", "list");
<<<<<<<
=======
this.status = $.create("span", {
c... |
<<<<<<<
const debugApiIds = newDebug('steem:api_ids');
const debugWs = newDebug('steem:ws');
let WebSocket;
if (isNode) {
WebSocket = require('ws'); // eslint-disable-line global-require
} else if (typeof window !== 'undefined') {
WebSocket = window.WebSocket;
} else {
throw new Error('Couldn\'t decide on a `Web... |
<<<<<<<
var bcrypt = require('bcryptjs');
=======
var Articles = require('../models/article.js');
var bcrypt = require('bcrypt');
>>>>>>>
var bcrypt = require('bcryptjs');
var Articles = require('../models/article.js'); |
<<<<<<<
=======
.factory('ClassView', function($http, $route) {
var qid;
return {
getQid: function(){
qid = ($route.current.params.id) ? ($route.current.params.id) : "Q5";
return qid;
}
};
})
>>>>>>>
.factory('ClassView', function($http, $route) {
var qid;
return {
getQid:... |
<<<<<<<
$("[data-toggle=popover]").popover({html:true});
var classBrowser = angular.module('classBrowserApp', ['ngAnimate', 'ngRoute', 'utilities', 'ui.bootstrap', 'pascalprecht.translate'])
=======
var classBrowser = angular.module('classBrowserApp', ['ngAnimate', 'ngRoute', 'utilities', 'angucomplete-alt'])
>>>>>... |
<<<<<<<
.when('/classview', { templateUrl: 'views/classview.html' })
.when('/propertyview', { templateUrl: 'views/propertyview.html'})
.when('/query', { templateUrl: 'views/queryview.html'})
=======
.when('/view', { templateUrl: 'views/view.html' })
>>>>>>>
.when('/view', { templateUrl: 'views/view.ht... |
<<<<<<<
function uniqueClasses(list) {
list = list.split(' ');
var hash = {};
var i = list.length;
var out = [];
while (i--) {
if (!hash.hasOwnProperty(list[i])) {
hash[list[i]] = 1;
out.unshift(list[i]);
}
}
return out.join(' ');
}
=======
/**
* ca... |
<<<<<<<
const {
getTempFilePath,
complete,
cleanupStream,
tempFileHandler
} = require('./tempFileHandler');
=======
const processNested = require('./processNested');
>>>>>>>
const {
getTempFilePath,
complete,
cleanupStream,
tempFileHandler
} = require('./tempFileHandler');
const processNested = requi... |
<<<<<<<
'networks': [
{
=======
'networks': {
'mainnet': {
'userCreated': false,
'http': 'https://gethnode.com/http',
'name': 'Mainnet (default)',
'ws': 'wss://gethnode.com/ws',
'id': '1'
},
'rinkeby': {
>>>>>>>
'networks': [
{
'userCreated': false,
... |
<<<<<<<
* @param {Object} [options.style] Map style and data source definition (either a JSON object or a JSON URL), described in the [style reference](https://mapbox.com/mapbox-gl-style-spec/)
=======
* @param {Object|string} options.style Map style. This must be an an object conforming to the schema described in ... |
<<<<<<<
glyphVertex.add(anchor.x, anchor.y, tl.x, tl.y, tex.x, tex.y, angle, minZoom, placementRange, maxZoom, placementZoom);
glyphVertex.add(anchor.x, anchor.y, tr.x, tr.y, tex.x + width, tex.y, angle, minZoom, placementRange, maxZoom, placementZoom);
glyphVertex.add(anchor.x, anch... |
<<<<<<<
constructor (options = {}) {
super(template, {
topic: options.topic,
reference: options.topic.url,
canComment: options.canComment
});
this.options = options;
this.topic = options.topic;
this.page = 0;
this.filter = new CommentsFilter();
this.sort = this.filter.ge... |
<<<<<<<
GLPainter.prototype.drawTile = function(tile, layers) {
this.setExtent(tile.tileExtent);
=======
Painter.prototype.drawTile = function(tile, layers) {
>>>>>>>
Painter.prototype.drawTile = function(tile, layers) {
this.setExtent(tile.tileExtent); |
<<<<<<<
var GlyphAtlas = require('../symbol/glyph_atlas');
var SpriteAtlas = require('../symbol/sprite_atlas');
=======
>>>>>>>
<<<<<<<
this.glyphAtlas = new GlyphAtlas(1024, 1024);
// this.glyphAtlas.debug = true;
this.glyphAtlas.bind(gl);
this.spriteAtlas = new SpriteAtlas(512, 512);
this.spr... |
<<<<<<<
['a_pos', 'a_extrude', 'a_linesofar'],
['u_matrix', 'u_linewidth', 'u_color', 'u_ratio', 'u_dasharray', 'u_blur', 'u_extra', 'u_antialiasingmatrix']);
=======
['a_pos', 'a_data'],
['u_matrix', 'u_exmatrix', 'u_linewidth', 'u_color', 'u_ratio', 'u_blur']);
>>>>>>>
['a_p... |
<<<<<<<
"gaussian": glify('../../shaders/gaussian.*.glsl'),
"label": glify('../../shaders/label.*.glsl'),
=======
>>>>>>>
"gaussian": glify('../../shaders/gaussian.*.glsl'), |
<<<<<<<
if (info['icon-image'] && this.sprite) {
imagePos = this.sprite[resolveTokens(feature, info['icon-image'])];
=======
if (info['point-image'] && this.sprite) {
imagePos = this.sprite[resolveTokens(feature.properties, info['point-image'])];
>>>>>>>
if (info['icon-image'] && this.spr... |
<<<<<<<
, t = require('t')
, delegates = require('delegates')
=======
, events = require('events')
>>>>>>>
, t = require('t')
, events = require('events')
<<<<<<<
this.options = domify(options({ proposal: proposal, citizen: citizen, t: t }));
this.events = delegates(this.options, this);
// this.even... |
<<<<<<<
exports.Map = require('./map.js');
exports.evented = require('./evented.js');
exports.chroma = require('./lib/chroma.js');
exports.util = require('./util.js');
=======
if (typeof window === 'undefined') {
require('./worker/worker.js');
} else {
exports.Map = require('./ui/map.js');
exports.Style =... |
<<<<<<<
actor.send('get icons', {
id: tile.id,
icons: icons
}, setIcons.bind(this));
=======
actor.send('get icons', {icons: icons}, function(err, newicons) {
if (err) return callback(err);
this.icons = newicons;
... |
<<<<<<<
Collision.prototype.place = function(boxes, anchor, horizontal, props) {
var padding = props['text-padding'];
var alwaysVisible = props['text-always-visible'];
var minPlacementScale = anchor.scale;
=======
Collision.prototype.place = function(boxes, anchor, minPlacementScale, maxPlacementScale,
... |
<<<<<<<
drawLine(gl, painter, layerData, layerStyle, tile, stats, params, style.sprite);
=======
drawLine(gl, painter, layerData, layerStyle, tile, stats[layer.bucket], params);
>>>>>>>
drawLine(gl, painter, layerData, layerStyle, tile, stats[layer.bucket], params, sty... |
<<<<<<<
, config = require('lib/config');
=======
, env = require('./env')
, utils = require('lib/utils')
, mandrillMailer = require('lib/mailer').mandrillMailer
, expressUrl = require('lib/express-url');
>>>>>>>
, config = require('lib/config');
<<<<<<<
* Save config in app
*/
app.se... |
<<<<<<<
} else if (info.type == 'point') {
var image = painter.images.texture(gl, info.url, tile.url);
if (image) {
gl.disable(gl.STENCIL_TEST);
gl.switchShader(painter.pointShader, painter.posMatrix, painter.exMatrix);
... |
<<<<<<<
var express = require('express');
var restrict = require('lib/utils').restrict;
var accepts = require('lib/accepts');
var utils = require('lib/utils');
var expose = utils.expose;
var api = require('lib/db-api');
var privileges = require('lib/forum-middlewares').privileges;
var t = require('t-component');
var l... |
<<<<<<<
GlyphSource.prototype.getSimpleGlyphs = function(fontstack, glyphIDs, tileID, callback) {
=======
GlyphSource.prototype.getRects = function(fontstack, glyphIDs, uid, callback) {
>>>>>>>
GlyphSource.prototype.getSimpleGlyphs = function(fontstack, glyphIDs, uid, callback) {
<<<<<<<
var rect = gly... |
<<<<<<<
/**
* @param {TileCoord} parent TileCoord that is potentially a parent of this TileCoord
* @param {number} sourceMaxZoom x and y coordinates only shift with z up to sourceMaxZoom
* @returns {boolean} result boolean describing whether or not `child` is a child tile of the root
*/
isCh... |
<<<<<<<
['u_matrix', 'u_exmatrix', 'u_texture', 'u_texsize', 'u_color', 'u_gamma', 'u_buffer', 'u_zoom', 'u_fadedist', 'u_minfadezoom', 'u_maxfadezoom', 'u_fadezoom']);
=======
['u_matrix', 'u_exmatrix', 'u_texture', 'u_texsize', 'u_color', 'u_gamma', 'u_buffer', 'u_angle', 'u_zoom', 'u_flip', 'u_fade... |
<<<<<<<
this._transportType = null;
this._transportParameters = null;
this._transport = null;
=======
this._speedometer = null;
this._controlPointCharacteristicId = null;
this._packetCharacteristicId = null;
this._handleProgressUpdate = _.throttle(this._handle... |
<<<<<<<
, tag: { type:ObjectId, ref:'Tag', required: true }
=======
, officialTitle: { type: String, required: false }
, mediaTitle: { type: String, required: false }
, summary: { type: String, required: false }
>>>>>>>
, tag: { type:ObjectId, ref:'Tag', required: true }
, officialTitle: { type: String, ... |
<<<<<<<
var express = require('express');
var api = require('lib/db-api');
var utils = require('lib/utils');
var accepts = require('lib/accepts');
var restrict = utils.restrict;
var expose = utils.expose;
var log = require('debug')('democracyos:topic');
var config = require('lib/config');
var notifier = require('lib/no... |
<<<<<<<
# INSERT(trigger_cell, destination_range [,formula_range,value_range,formula_range, ...])
# DELETEIF(trigger_cell, criteria , test_range)
# COMMAND(trigger_cell, commands)
# COMMANDIF(trigger_cell, condition, commands)
=======
# INSERT(trigger_cell, destination_range [,formula_range,value_range,formula_rang... |
<<<<<<<
this.fetch = this.fetch.bind(this);
this.onlawsready = this.onlawsready.bind(this);
=======
this.reset = this.reset.bind(this);
this.fetch = this.fetch.bind(this);
this.refresh = this.refresh.bind(this);
>>>>>>>
this.reset = this.reset.bind(this);
this.fetch = this.fetch.bind(this);
this.re... |
<<<<<<<
import brazilPopulation from '../../data/brazil/brazil-populations.csv'
=======
import irelandVotes from '../../data/ireland/constituency_values.csv'
>>>>>>>
import brazilPopulation from '../../data/brazil/brazil-populations.csv'
import irelandVotes from '../../data/ireland/constituency_values.csv' |
<<<<<<<
if (!util.isBlockHash(req.query.block)) {
return res.status(400).send({
error: 'Invalid block hash',
});
}
db.blocks.getBestHeight(
(err, blockHeight) => {
if (err) {
logger.log('err', err);
=======
const height = db.blocks.bestH... |
<<<<<<<
ios.sockets.in('inv').emit('block', block);
};
module.exports.broadcast_address_tx = function(address, tx) {
ios.sockets.in(address).emit('tx', tx);
};
=======
ios.sockets.emit('block', block);
};
module.exports.broadcastSyncInfo = function(syncInfo) {
ios.sockets.emit('block', syncInfo);
};
>>>>>>... |
<<<<<<<
angular.module('insight.system').controller('IndexController',
['$scope',
'Global',
'socket',
'Blocks',
'Transactions',
function($scope, Global, socket, Blocks, Transactions) {
=======
angular.module('insight.system').controller('IndexController', ['$scope', '$rootScope', 'Global', 'so... |
<<<<<<<
if (err) return res.status(400).json({ error: err.message })
return res.json(200)
=======
if (err) return res.status(200).json({ error: err.message })
return res.status(200).send()
>>>>>>>
if (err) return res.status(400).json({ error: err.message })
return res.status(200).send() |
<<<<<<<
};
};
=======
}
/**
* iban
*
* @method faker.finance.iban
*/
self.iban = function (formatted) {
var ibanFormat = faker.random.arrayElement(ibanLib.formats);
var s = "";
var count = 0;
for (var b = 0; b < ibanFormat.bban.length; b++) {
var bban = ibanForm... |
<<<<<<<
"name": ["first_name", "last_name", "prefix", "suffix", "title", "male_first_name", "male_last_name", "female_first_name", "female_last_name"],
"address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "state", "state_abbr", "street_prefix"],
"company": ["adjective", ... |
<<<<<<<
"address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr"],
=======
"address": ["city_prefix", "city_suffix", "street_suffix", "county", ... |
<<<<<<<
exports.definitions = require('./lib/definitions');
exports.Finance = require('./lib/finance');
=======
exports.random = require('./lib/random');
exports.definitions = require('./lib/definitions');
>>>>>>>
exports.random = require('./lib/random');
exports.definitions = require('./lib/definitions');
exports.F... |
<<<<<<<
"name": ["first_name", "last_name", "prefix", "suffix", "title"],
"address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "state", "state_abbr"],
"company": ["adjective", "noun", "descriptor", "bs_adjective", "bs_noun", "bs_verb", "suffix"],
=======
"name": ["first_name", "last... |
<<<<<<<
/** @typedef {"nsfw"|"racist"|"sexist"|"religious"|"political"|"explicit"} BlacklistFlags */
=======
/** @typedef {"Any"|"Programming"|"Miscellaneous"|"Dark"} JokeCategory */
>>>>>>>
/** @typedef {"nsfw"|"racist"|"sexist"|"religious"|"political"|"explicit"} BlacklistFlags */
/** @typedef {"Any"|"Programm... |
<<<<<<<
var deferred = Q.defer(),
ignore;
=======
var deferred = Q.defer();
var ignore;
var finish;
finish = function (err) {
// Ensure that all listeners are removed
writer.removeAllListeners();
reader.removeAllListeners();
// If we got an error, simply r... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
.on('suggest.show', $.proxy(this.options.onshow, this))
.on('suggest.select', $.proxy(this.options.onselect, this))
.on('suggest.lookup', $.proxy(this.options.onlookup, this))
.on('keypress', $.proxy(this.__keypress, this))
.on('keyup', $.proxy(this.__keyup, this)... |
<<<<<<<
import FetchCompileWasmTemplatePlugin from 'webpack/lib/web/FetchCompileWasmTemplatePlugin';
=======
import WORKER_PLUGIN_SYMBOL from './symbol';
>>>>>>>
import FetchCompileWasmTemplatePlugin from 'webpack/lib/web/FetchCompileWasmTemplatePlugin';
import WORKER_PLUGIN_SYMBOL from './symbol'; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.