Ugggh… fixing a donked merge

public/js/FileSaver.min.js

public/js/app.min.js

public/js/bootstrap-table-locale-all.js

public/js/bootstrap-table-locale-all.min.js

public/js/bootstrap-table.css

public/js/bootstrap-table.min.css

public/js/bootstrap-table.min.js

public/js/bootstrap.datepicker.js

public/js/bootstrap/css/bootstrap.css

public/js/bootstrap/css/bootstrap.css.map

public/js/bootstrap/css/bootstrap.min.css

public/js/bootstrap/fonts/glyphicons-halflings-regular.eot

public/js/bootstrap/fonts/glyphicons-halflings-regular.svg

public/js/bootstrap/fonts/glyphicons-halflings-regular.ttf

public/js/bootstrap/fonts/glyphicons-halflings-regular.woff

public/js/bootstrap/fonts/glyphicons-halflings-regular.woff2

public/js/bootstrap/js/npm.js

public/js/dashboard.js

public/js/dashboard2.js

...ns/accent-neutralise/bootstrap-table-accent-neutralise.js