search

GitbookIO / plugin-mathjax

MathJAX plugin for GitBook
Apache License 2.0
89 stars 51 forks source link

Book building fails due to unresolved merge markers in index.js #37

Open brlin-tw opened 6 years ago

brlin-tw commented 6 years ago 
$ gitbook build
info: 8 plugins are installed 
info: 7 explicitly listed 
info: loading plugin "mathjax"... ERROR

PluginError: Error with plugin "mathjax": Unexpected token <<

The error is due to the unresolved merge markers in https://github.com/GitbookIO/plugin-mathjax/blob/master/index.js

<<<<<<< HEAD
var Promise = require('q');
var crc     = require('crc');
var mjAPI   = require('mathjax-node/lib/mj-single.js');

var started   = false;
=======
var Q = require('q');
var fs = require('fs');
var path = require('path');
var crc = require('crc');
var exec = require('child_process').exec;
var mjAPI = require('mathjax-node/lib/mj-single.js');

var started = false;
>>>>>>> master