Fixed merge conflicts

This commit is contained in:
Chris Troutner
2024-03-22 10:59:22 -07:00
113 changed files with 16476 additions and 21438 deletions
+6 -3
View File
@@ -3,10 +3,10 @@
*/
// Public npm libraries
const assert = require('chai').assert
const sinon = require('sinon')
import sinon from 'sinon'
const Controllers = require('../../../src/controllers')
import Controllers from '../../../src/controllers/index.js'
const assert = require('chai').assert
describe('#Controllers', () => {
let uut
@@ -33,6 +33,9 @@ describe('#Controllers', () => {
attachRPCRouter: () => {}
}
// Mock the timer controllers
sandbox.stub(uut.timerControllers, 'startTimers').returns()
const app = {
use: () => {}
}