Fix conflicts

This commit is contained in:
tgpethan 2020-01-04 15:16:08 +00:00
parent 742f9a1dde
commit c36d31863e

View file

@ -107,7 +107,7 @@ fs.readFile('./misc/ascii.txt', function(err, data) {
});
});
function server() {
function frameworkServer() {
// Load in the request handler's extra required items.
reqhandler.extras();
// Define where GET requests go to in the request handlers.