conflict_resolution
stringlengths
27
16k
<<<<<<< G.renderer.setSize( G.w , G.h ); G.container.appendChild( G.renderer.domElement ); G.composer = new WAGNER.Composer( G.renderer, { useRGBA: false } ); G.stats.domElement.id = 'stats'; //document.body.appendChild( G.stats.domElement ); ======= this.tween = TWEEN; TWEEN.origTween = TWEEN.Tween; TWEEN....
<<<<<<< var REDIS_PREFIX = 'batch:jobs:'; ======= var debug = require('./util/debug')('job-backend'); var REDIS_PREFIX = 'batch:jobs:'; var REDIS_DB = 5; >>>>>>> var debug = require('./util/debug')('job-backend'); var REDIS_PREFIX = 'batch:jobs:'; var REDIS_DB = 5; <<<<<<< this.db = 5; ======= >>>>>>> <<<<<...
<<<<<<< if (!_.isArray(this.uciq_fields[item.database])) { this.uciq_fields[item.database]=[]; } ======= if (!_.isArray(this.uciq_fields[item.database])) { this.uciq_fields[item.database]=[]; } >>>>>>> if (!_.isArra...
<<<<<<< SqlController.$inject = ['$scope', '$rootScope', '$window', 'localStorageService', 'LxNotificationService', 'API', '$filter']; ======= SqlController.$inject = [ '$scope', '$rootScope', '$window', 'localStorageService', 'API', '$mdSidenav', '$mdDi...
<<<<<<< // Если state не найден - шлю 404 $urlRouterProvider.otherwise(function($injector) { var $state = $injector.get("$state"); $state.transitionTo('404'); }); } ]) .config(['$translateProvider', function ($translateProvider) { $translateProvider.translations('en', { 'Подключение': 'C...
<<<<<<< let debug; let statusTextMap; ======= >>>>>>> let statusTextMap; <<<<<<< opts.sendAsJson = config.sendAsJson === undefined ? true : config.sendAsJson; opts.status = config.status || 200; opts.statusText = statusTextMap['' + opts.status]; ======= opts.sendAsJson = responseConfig.sendAsJson === undefine...
<<<<<<< invalidAddressBookFile() { this._ngToast.create({ content: this._$filter('translate')('ALERT_INVALID_ADDRESS_BOOK_FILE'), className: 'danger' }); } ======= namespaceExpiryNotice(ns, blocks) { this._ngToast.create({ content: this._$filter...
<<<<<<< setAnimatedCoords(coords) { this._coords = coords; this.svgPaths = renderSVGPaths(coords, {renderAs: 'nodes'}); this.svgPaths.forEach((path, index) => { const oldPath = this.svgContainer.querySelector(`path:nth-child(${index + 1})`); if (!oldPath) { this.svgContainer.appendChi...
<<<<<<< /* globals test, ok, templatizer, unaltered, multipleDirs, dontRemoveMixins, app, app2, _, globalErrorCount */ ======= /* globals test, ok, equal, templatizer, unaltered, multipleDirs, dontRemoveMixins, app, _, globalErrorCount, glob, negativeglob */ >>>>>>> /* globals test, ok, equal, templatizer, unaltered...
<<<<<<< ======= var map1 = [["F","F","W","F","F","F","F","F","F"], ["F","F","W","F","F","F","F","F","F"], ["F","W","W","F","F","F","F","F","F"], ["F","F","F","F","F","F","F","F","F"], ["F","W","W","W","W","W","W","F","F"], ["F","F","W","F","F","F","W","F","F...
<<<<<<< throw new Error('Nothing to download'); ======= if (this.stopping === null) { new Error('Nothing to download'); } else { // Re-trigger after stop completes this.stopping.then(() => { this.download(); ...
<<<<<<< responsive: function responsive(contexts, options) { ======= /*! * * @public methods * **/ >>>>>>> responsive: function responsive(contexts, options) { /*! * * @public methods * **/ <<<<<<< ======= /*! * * @private methods ...
<<<<<<< // @public methods ======= >>>>>>> <<<<<<< // @private methods ======= >>>>>>>
<<<<<<< _truncate: function(string, length) { let shortened = string.replace(/\s+/g, ' '); if (shortened.length > length) shortened = shortened.substring(0,length-1) + '...'; ======= /* When text change, this function will check, for each item of the historySection, if it shou...
<<<<<<< grunt.loadNpmTasks('grunt-appcache'); ======= grunt.loadNpmTasks('grunt-browserify'); >>>>>>> grunt.loadNpmTasks('grunt-appcache'); <<<<<<< grunt.registerTask('default', ['uglify', 'concat', 'wrap', 'less', 'autoprefixer', 'imageEmbed', 'appcache']); ======= grunt.registerTask('default', ['br...
<<<<<<< /** * @lends $.editor.prototype */ var RaptorWidget = { ======= $.widget('ui.editor', /** * @lends $.editor.prototype */ { >>>>>>> /** * @lends $.editor.prototype */ var RaptorWidget = { <<<<<<< ======= =================================================================*/ getRang...
<<<<<<< ======= if(!text) return; >>>>>>> if(!text) return;
<<<<<<< var silentTimeout; module.exports = function(coreObj, conf) { config = conf; if (config && config.consumerKey && config.consumerSecret) { redis = require('../lib/redisProxy.js').select(config.redisDB); twitterConsumerKey = config.consumerKey; twitterConsumerSecret = config.consumerSecret; timeout = c...
<<<<<<< bower = require("bower"), ======= bower = require("bower"), >>>>>>> bower = require("bower"), <<<<<<< es = require("event-stream"), plumber = require("gulp-plumber"), ======= es = require("event-stream"), plumber = require("gulp-plumber"), >>>>>>> es = require("event-stream"), plumber =...
<<<<<<< ======= /** * Checks if an element is empty. * * @param {jQuery|Element} element The element to be checked. * @returns {Boolean} Returns true if element is empty. */ >>>>>>> /** * Checks if an element is empty. * * @param {jQuery|Element} element The element to be checked. * @returns {Boolean} Retur...
<<<<<<< if (!results.params.antiAbuse) { results.params.antiAbuse = {offensive: true}; ======= if(!room.params) room.params = {}; if(!room.params["anti-abuse"]) room.params["anti-abuse"] = {}; if (typeof room.params["anti-abuse"].wordblock !== "boolean") { room.params["anti-abuse"].word...
<<<<<<< "admin-notifier", "entityloader", "irc", "twitter", "jws", "censor", "email", "superuser", "search", "sitemap", ======= "entityloader", "irc", "twitter", "censor", "email", "superuser", "search", "sitemap", >>>>>>> "entityloader", "irc", "twitter", "jws", "censor", "email", "superuser", "s...
<<<<<<< * Determine whether object is a number * {@link http://stackoverflow.com/a/1421988/187954}. * * @param {mixed} object The object to be tested ======= * Determine whether object is a number {@link http://stackoverflow.com/a/1421988/187954}. * @param {mixed} object The object to be tested. >>>>>>> * D...
<<<<<<< libsb.on("navigate", function(state, next) { var room = state.roomName; if(currentState.embed == "toast") return next(); enter(room); if(state.old && state.old.roomName === state.roomName) return next(); next(); }, 10); libsb.on("init-dn", function(init, next) { if(currentState.embed == "toast...
<<<<<<< threader: 11, sitemap: 12, ======= >>>>>>> sitemap: 12,
<<<<<<< module.exports = function(message, cb) { function send(){ //console.log("trying to send in api/message:",message); pool.get(function(err, db) { if (err) throw err; if (!message.id) message.id = guid(); if (!message.time) message.time = new Date().getTime(); if(abuse.rejectable(message)) { ...
<<<<<<< /** * @param {string} listType List type, e.g. ul, ol or blockquote * @param {string} listItem List item, e.g. li or p * @param {Element} wrapper */ ======= /** * @fileOverview List manipulation helper functions. * @author David Neilsen david@panmedia.co.nz * @author Michael Robinson michael@panmedi...
<<<<<<< // if(data.params[i].error) newRoom.params[i] = action.old.params[i]; newRoom.params[i] = data.params[i]; ======= // if(data.params[i].error) newRoom.params[i] = action.old.params[i]; newRoom.params[i] = data.params[i]; >>>>>>> ...
<<<<<<< gulp.task("embed-legacy", function() { return bundle("embed/embed-parent.js", { debug: debug }) ======= gulp.task("embed", function() { return bundle("embed/embed-parent.js", { debug: true }) .pipe(sourcemaps.init({ loadMaps: true })) >>>>>>> gulp.task("embed-legacy", function() { return bundle("embed/em...
<<<<<<< if(!m.to && Object.keys(user.rooms).length != 0) { m.to = m.to || Object.keys(user.rooms); } if(typeof m.to != "string" && m.to.length==0) return; ======= m.to = m.to || Object.keys(user.rooms); if(typeof m.to != "string" && m.to.length==0) return; if(m.type == 'join'){ //check for us...
<<<<<<< //console.log(name); return [ "span", { 'class': 'scrollback-message-nick', onmouseout: function() { if(self.userStyle) self.userStyle.parentNode.removeChild(self.userStyle); }, onmouseover: function() { var ucss = {".scrollback-tread-row": {width: "0 !important"}}; ucss[ ".scroll...
<<<<<<< var crypto = require("crypto"); /*var log = require("../lib/logger.js")*/ var utils = require("../lib/app-utils.js"); var names = require("../lib/generate.js").names; ======= var crypto = require('crypto'); var userUtils = require('../lib/user-utils.js'); var names = require('../lib/generate.js').names; var m...
<<<<<<< // safeSends sends the data over the socket only after the socket has // been initialised if(libsb.isInited) { client.send(data); }else { queue.push(function() { client.send(data); }); } ======= // safeSends sends the data over the socket only after t...
<<<<<<< var state = require("./../store/store.js")(core, config ); window.state = state; require("./store/view-manager.js")(core, config, state); ======= require("./store/view-manager.js")(core, config, state); >>>>>>> state = require("./../store/store.js")(core, config ); window.state = stat...
<<<<<<< server: { protocol: "http:", host: "local.scrollback.io" // localhost:7528 }, analytics: { "id": "UA-XXXXXXXX-1" }, localStorage: { version: 1.0 }, errorception: { // https://errorception.com/ id: "XXXXXXXXXXXXXXXXX" } ======= server: { protocol: "http:", host: "//local...
<<<<<<< function rangeSelectElement(range, element) { range.selectNode($(element)[0]); } ======= /** * While there are common ancestors, check to see if they match an element. * @todo Not sure of return * @param {RangyRange} range The range to expand. * @param {array} elements An array of elements to check t...
<<<<<<< $logs = $(".chat-area"); $logs.infinite({ ======= 'use strict'; $(".chat-area").infinite({ >>>>>>> $logs = $(".chat-area"); $logs.infinite({ $(".chat-area").infinite({ <<<<<<< libsb.on('text-dn', function(text, next) { if($logs.data("lower-limit")) $("#logs").addBelow($("<div>").text("N...
<<<<<<< if (changes.session) updateSession(changes.session); if (changes.user) updateCurrentUser(changes.user); ======= if (changes.user) updateCurrentUser(changes.user); buildIndex(changes); core.emit("statechange", changes); >>>>>>> if (changes.session) updateSession(changes.session); if (chang...
<<<<<<< scrollbackApp.controller('rootController' , ['$scope', '$factory', '$location', function($scope, $factory, $location) { ======= scrollbackApp.controller('rootController' , ['$scope', '$factory', function($scope, $factory) { $scope.status= { waiting : false }; >>>>>>> scrollbackApp.controller('rootCont...
<<<<<<< require('./lib/swipe-events.js'); // libsb files var libsb = require('./interface/interface-client')(core); require('./localStorage/localStorage-client')(libsb); require('./socket/socket-client')(libsb); //Bootup related require('./client-init/client-init.js')(libsb); require('./id-generator/id-generator-clie...
<<<<<<< ======= log.i(matches, text); >>>>>>> <<<<<<< else a.tags.push("abusive", "hidden"); log(a); ======= a.tags.push("abusive", "hidden"); >>>>>>> else a.tags.push("abusive", "hidden"); log.i(matches, text);
<<<<<<< config.leveldb.path = "data-test"; ======= config["leveldb-storage"].path = "data-test"; config["leveldb-storage"].global = config.global; // describe("Just to try something out quick.",function(){ // it("Checking join:", function(done) { // core.emit("getRooms", {hasMember:"harish"}, function(err, data){ ...
<<<<<<< // Handle back button /* ======= // On history change, load the appropriate state >>>>>>> // Handle back button // On history change, load the appropriate state <<<<<<< });*/ ======= }); >>>>>>> });
<<<<<<< rooms[element.id].params = JSON.parse(element.params)|| {}; console.log("Caching rooms", element); ======= console.log(element.params); try { rooms[element.id].params = JSON.parse(element.params); } catch(e) { rooms[element.id].params = {}; } console.log("Caching rooms", element.id); >>>>...
<<<<<<< match, event_name, selector, nodes; ======= match, event_name, selector, nodes, _this = this; >>>>>>> match, event_name, selector, ...
<<<<<<< for (i = 0; i < interfaces[key].length; i++) { address = interfaces[key][i].address; if (address.indexOf(':') === -1) { debug('add A record for interface: %s %s', key, address); ======= for (var i = 0; i < interfaces[key].length; i++) { var iface = interfaces[key]...
<<<<<<< // Sort sources this.currentSources = src.sort(compareResolutions); this.groupedSrc = bucketSources(this.currentSources); // Pick one by default var chosen = chooseSrc(this.groupedSrc, this.currentSources); this.currentResolutionState = { label: chosen....
<<<<<<< <a href="javascript:;" title="Add or remove user from subreddit ban, contributor, and moderator lists." class="user-role active">Role</a>\ <a href="javascript:;" title="Edit user flair" class="edit-user-flair">User Flair</a>\ ======= <a href="javascript:;"...
<<<<<<< export const ID = 'transactionHistory' ======= function sum (txns, address, asset) { const matchingTxns = filter(txns, (txn) => { return txn.asset === asset && txn.address_hash === address }) return reduce(matchingTxns, (sum, txn) => { return sum.plus(txn.value) }, toBigNumber(0)) } export c...
<<<<<<< * @param {Object|null} [options] => https server options ======= * @param {Function|null} [errorCallback] * @param {Object|null} [options] >>>>>>> * @param {Object|null} [options] => https server options * @param {Function|null} [errorCallback] * @param {Object|null} [options]
<<<<<<< _.each(['creds', 'servers', 'atomServer', 'crypto', 'system'], function (cmdName) { ======= _.each(['creds', 'servers', 'crypto', 'system', 'pinning'], function (cmdName) { >>>>>>> _.each(['creds', 'servers', 'atomServer', 'crypto', 'system', 'pinning'], function (cmdName) {
<<<<<<< const ocspCachePeriod = process.env.BEAME_OSCSP_CACHE_PERIOD || 1000 * 60 * 60 * 24 * 30; const ocspCheckInterval = process.env.BEAME_OCSP_CHECK_INTERVAL || 1000 * 60 * 60 * 24; const renewalCheckInterval = process.env.BEAME_RENEWAL_CHECK_INTERVAL || 1000 * 60 * 60 * 24; ======= const defaultDays2Log = 7; ...
<<<<<<< determineCertStatus() { if (this.dirShaStatus && this.dirShaStatus.length !== 0) { // // This means this is a brand new object and we dont know anything at all this.credentials = this.readCertificateDir(); } if (this.hasKey(config.CertificateFiles.X509)) { this.state = this.state | config.Cr...
<<<<<<< setReadOnly( utils, 'isObjectLike', require( '@stdlib/utils/is-object-like' ) ); setReadOnly( utils, 'isBuffer', require( '@stdlib/utils/is-buffer' ) ); setReadOnly( utils, 'isString', require( '@stdlib/utils/is-string' ) ); ======= setReadOnly( utils, 'isPrimitive', require( '@stdlib/utils/is-primitive' )...
<<<<<<< import { doClaimAllGas, doSendAsset } from '../wallet/api.js'; import { sendEvent, clearTransactionEvent } from '../modules/transactions'; import { setClaimRequest, disableClaim } from '../modules/claim'; ======= import { doClaimAllGas, doSendAsset } from 'neon-js'; import { sendEvent, clearTransactionEvent, ...
<<<<<<< promise = $q.when(httpConfig), self = this; ======= abortDeferred = $q.defer(); function abortRequest() { abortDeferred.resolve(); } ...
<<<<<<< it('should allow changing urls after first operation', function () { $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}}); Test.get(123); $httpBackend.flush(); $httpBackend.expectGET('/test2/123').respond(200, {test: {id: 123, a...
<<<<<<< import tr from './tr.yml' ======= import pl from './pl.yml' >>>>>>> import tr from './tr.yml' import pl from './pl.yml' <<<<<<< tr, ======= pl, >>>>>>> tr, pl,
<<<<<<< {privacyPolicyLink} ======= >>>>>>> {privacyPolicyLink} <<<<<<< {secondButton} {acceptButton} ======= <button className="cm-btn cm-btn-success" type="button" onClick={this.saveAndHide}>{t(['ok'])}</button> ...
<<<<<<< import { getAccountFromWIFKey, decryptWIF } from 'neon-js' import { verifyPrivateKey, validatePassphrase } from '../core/wallet' ======= import { verifyPrivateKey } from '../core/wallet' >>>>>>> import { verifyPrivateKey, validatePassphrase } from '../core/wallet' <<<<<<< import { ROUTES } from '../core/con...
<<<<<<< return acc; } return acc.concat({ output, suggestionIndex: _.suggestionIndex }); }, []) .filter(_ => !!_); if (!outputsAndSuggestions.length) { return false; } if (dispatch) { const tr = state.tr; outputs...
<<<<<<< title = _props.title, animation = _props.animation; ======= title = _props.title, optimized = _props.optimized, zIndex = _props.zIndex; >>>>>>> title = _props.title, animation = _props.animation; optimized = _prop...
<<<<<<< chrome.storage.sync.get( { lastLaunchedVersion: thisVersion, }, () => { chrome.storage.sync.get( { AutoJoinButton: false, AutoDescription: true, IgnoreGroups: false, IgnorePinned: true, IgnoreWhitelist: false, IgnoreGroupsBG: false, Ign...
<<<<<<< it('should be able to abort a stream piped directly to Amazon S3 if max file using the multi part upload', function(done) { var testLength = 7242880, chunkSize = 2048, stream = new mockstream.MockDataStream({chunkSize: chunkSize, streamLength: testLength}), opts ...
<<<<<<< import { wallet, api } from 'neon-js' import { flatten } from 'lodash-es' ======= import { wallet, api } from '@cityofzion/neon-js' import { flatten, isEmpty } from 'lodash-es' >>>>>>> import { flatten } from 'lodash-es' import { wallet, api } from '@cityofzion/neon-js'
<<<<<<< window.WAPI._serializeNumberStatusObj = (obj) => { if (obj == undefined) { return null; } return Object.assign({}, { id: obj.jid, status: obj.status, isBusiness: (obj.biz === true), canReceiveMessage: (obj.status === 200) }); }; window.WAPI.checkNumberStatus = async funct...
<<<<<<< export default applyScalars( applyDirectives( makeAugmentedSchema({ typeDefs, resolvers, config: { query: { exclude: [ 'Badge', 'Embed', 'InvitationCode', 'EmailAddress', 'Notfication', 'Statistics'...
<<<<<<< import { getBalance, getTransactionHistory, getMarketPriceUSD, neoId, getClaimAmounts, getWalletDBHeight } from '../wallet/api.js'; import { setBalance, setMarketPrice, resetPrice, setTransactionHistory, } from '../modules/wallet'; import { setBlockHeight, setNetwork } from '../modules/metadata'; import { setCl...
<<<<<<< Given('"Spammy Spammer" wrote a post {string}', title => { cy.factory() .build("post", { ======= Given('{string} wrote a post {string}', (_, title) => { cy.createCategories("cat21") .factory() .create("Post", { authorId: 'annoying-user', >>>>>>> Given('{string} wrote a post {string}', (...
<<<<<<< import { host, login, gql } from '../../jest/helpers' import { neode } from '../../bootstrap/neo4j' ======= import { host, login, gql } from '../../jest/helpers' >>>>>>> import { host, login, gql } from '../../jest/helpers' import { neode } from '../../bootstrap/neo4j' <<<<<<< describe('Notification', () =>...
<<<<<<< 'DECIDED', ======= 'Donations', >>>>>>> 'DECIDED', 'Donations', <<<<<<< 'DECIDED', ======= 'Donations', >>>>>>> 'DECIDED', 'Donations',
<<<<<<< import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect' ======= import Filters from '~/plugins/vue-filters' import TeaserImage from '~/components/TeaserImage/TeaserImage' >>>>>>> import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect' import Filters from '~/plugins...
<<<<<<< console.log('parent', parent) ======= >>>>>>>
<<<<<<< import validation from './validation' import handleContentData from './handleHtmlContent/handleContentData' ======= import validation from './validation/validationMiddleware' import notifications from './notifications' import email from './email/emailMiddleware' >>>>>>> import validation from './validation/v...
<<<<<<< blurImage: true, ======= imageAspectRatio: 300 / 169, >>>>>>> blurImage: true, imageAspectRatio: 300 / 169, <<<<<<< blurImage: false, ======= imageAspectRatio: 300 / 1500, >>>>>>> blurImage: false, imageAspectRatio: 300 / 1500, <<<<<<< ...
<<<<<<< CreateSocialMedia: validateUrl, CreateComment: validateComment, UpdateComment: validateComment } ======= CreateSocialMedia: validateUrl, }, >>>>>>> CreateSocialMedia: validateUrl, CreateComment: validateComment, UpdateComment: validateComment, },
<<<<<<< const _updateLocalXr = () => { ======= const _bindXrFramebuffer = () => { if (vrPresentState.glContext) { nativeWindow.setCurrentWindowContext(vrPresentState.glContext.getWindowHandle()); vrPresentState.glContext.setDefaultFramebuffer((vrPresentState.layers.length > 0 || vrPresen...
<<<<<<< } export const allowEmbedIframesMutation = () => { return gql` mutation($id: ID!, $allowEmbedIframes: Boolean) { UpdateUser(id: $id, allowEmbedIframes: $allowEmbedIframes) { id allowEmbedIframes } } ` } ======= } export const checkSlugAvailableQuery = gql` query($sl...
<<<<<<< $blurImage: Boolean ======= $imageAspectRatio: Float >>>>>>> $blurImage: Boolean $imageAspectRatio: Float <<<<<<< blurImage: $blurImage ======= imageAspectRatio: $imageAspectRatio >>>>>>> blurImage: $blurImage imageAspectRatio: $imag...
<<<<<<< import validation from './validation' import handleContentData from './handleHtmlContent/handleContentData' ======= import validation from './validation/validationMiddleware' import notifications from './notifications' import email from './email/emailMiddleware' >>>>>>> import validation from './validation/v...
<<<<<<< import { neo4jgraphql } from 'neo4j-graphql-js' ======= import { AuthenticationError } from 'apollo-server' >>>>>>> import { AuthenticationError } from 'apollo-server' <<<<<<< } session.close() throw new Error('Incorrect password.') } session.close() throw new Erro...
<<<<<<< async requestPresent(layers) { /* GlobalContext.xrState.renderWidth[0] = this.window.innerWidth * this.window.devicePixelRatio / 2; GlobalContext.xrState.renderHeight[0] = this.window.innerHeight * this.window.devicePixelRatio; */ await this.onrequestpresent(); const [{source: canvas}] =...
<<<<<<< ======= URL.createObjectURL = blob => { const url = 'blob:' + global.location.protocol + '//' + global.location.host + '/' + GlobalContext.xrState.blobId[0]++; nativeCache.set(url, blob.buffer); return url; }; URL.revokeObjectURL = url => { nativeCache.delete(url); }; URL.lookupObjectURL = url => { ...
<<<<<<< // 3rd sort criteria: topic name return compare(topic_1.value.toLowerCase(), topic_2.value.toLowerCase()) ======= // 2nd sort criteria: topic name return compare(topic_1.value, topic_2.value) >>>>>>> // 2nd sort criteria: topic name retu...
<<<<<<< ======= import React, { Component, PropTypes } from 'react'; import Draggable from '@bokuweb/react-draggable-custom'; import Resizable from 'react-resizable-box'; const boxStyle = { width: 'auto', height: 'auto', cursor: 'move', position: 'absolute', }; export default class ReactRnd extends Componen...
<<<<<<< if (_hex) { c = sjcl.codec.base32._hexChars; } for (i=0; out.length * BASE <= bl; ) { ======= for (i=0; out.length * BASE < bl; ) { >>>>>>> if (_hex) { c = sjcl.codec.base32._hexChars; } for (i=0; out.length * BASE < bl; ) {
<<<<<<< "use strict";var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=func...
<<<<<<< <AccountIcon style={AppStyles.icon} seed={'0x' + this.state.address} /> <Text style={AppStyles.hintText}>name</Text> ======= <Text style={AppStyles.hintText}>Account Name</Text> >>>>>>> <AccountIcon style={AppStyles.icon} seed={'0x' + this.state.address} /> <Text style...
<<<<<<< 'touch /var/lock/subsys/' + service_name, 'chkconfig --add ' + destination, 'chkconfig ' + service_name + ' on', ======= 'touch /var/lock/subsys/pm2', 'chkconfig --add pm2', 'chkconfig pm2 on', >>>>>>> 'touch /var/lock/subsys/' + service_name, '...
<<<<<<< else if(path.includes("/downloads/federal-revenue-by-company/")){ loader.addPagesArray([{"componentChunkName":"component---src-pages-downloads-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"federal-revenue-by-company.json","path": path}]); ...
<<<<<<< var howItWorksCoalExciseTaxPageFrontmatter = "---"+os.EOL+ "title: Onshore Oil & Gas | How it Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/coal-excise-tax/"+os.EOL+ "---"+os.EOL; ======= var howItWorksMineralsPageFrontmatter = "---"+os.EOL+ "title: Nonene...
<<<<<<< id: index+"-resource-revenue", ======= id: index+"-revenue", Month: revenueData[SOURCE_COLUMNS.Month], CalendarYear: revenueData[SOURCE_COLUMNS.CalendarYear], >>>>>>> id: index+"-resource-revenue", Month: revenueData[SOURCE_COLUMNS.Month], CalendarYear: revenueData[SOURCE_COLUMNS.Calenda...
<<<<<<< else if(path.includes("/state-laws-and-regulations") && !lastFourteen.includes("default-page")){ loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-state-law...
<<<<<<< var howItWorksLwcfPageFrontmatter = "---"+os.EOL+ "title: Land and Water Conservation Fund | How It Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/land-and-water-conservation-fund/"+os.EOL+ "---"+os.EOL; ======= var howItWorksCoalExciseTaxPageFrontmatter = "---"+o...
<<<<<<< var howItWorksDisbursementsPageFrontmatter = "---"+os.EOL+ "title: Disbursements | How it Works"+os.EOL+ "layout: none"+os.EOL+ "permalink: /how-it-works/disbursements/"+os.EOL+ "---"+os.EOL; ======= var howItWorksCompanyRevenue2017Frontmatter = "---"+os.EOL+ "title: Federa...
<<<<<<< else if(path.includes("/aml-reclamation-program") && !lastFourteen.includes("default-page")){ loader.addPagesArray([,{"componentChunkName":"component---src-templates-content-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-aml...
<<<<<<< else if(path.includes("/nonenergy-minerals") && !lastFourteen.includes("default-page")){ loader.addPagesArray([{"componentChunkName":"component---src-templates-default-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-works-nonenergy-mineral...
<<<<<<< else if(path.includes("/reconciliation/2015") && !lastFourteen.includes("default-page")){ loader.addPagesArray([,{"componentChunkName":"component---src-templates-how-it-works-reconciliation-js","layout":"layout---index","layoutComponentChunkName":"component---src-layouts-index-js","jsonName":"how-it-w...
<<<<<<< const HOWITWORKS_RECONCILIATION_TEMPLATE = path.resolve(`src/templates/how-it-works-reconciliation.js`); ======= const HOWITWORKS_REVENUE_BY_COMPANY_TEMPLATE = path.resolve(`src/templates/how-it-works-revenue-by-company.js`); >>>>>>> const HOWITWORKS_RECONCILIATION_TEMPLATE = path.resolve(`src/templates/how-...
<<<<<<< import {DownloadDataLink} from '../components/layouts/icon-links/DownloadDataLink' ======= import IconArchive from '-!svg-react-loader!../img/svg/icon-archive.svg'; import {DataArchiveLink} from '../components/layouts/icon-links/DataArchiveLink'; import {ArchiveBanner} from '../components/info/ArchiveBanner' ...