From c36d31863e73b2be9995cd0128722e0c9867458e Mon Sep 17 00:00:00 2001
From: tgpethan <ethan@pyra-studios.net>
Date: Sat, 4 Jan 2020 15:16:08 +0000
Subject: [PATCH] Fix conflicts

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index eaad2ee..a321d93 100644
--- a/index.js
+++ b/index.js
@@ -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.