Merge remote-tracking branch 'origin/master' into eric_config_parser

I seem to have fixed the merge errors
2022-07-25 21:05:16 +02:00
parent 35ac55b5e8 26dad07a87
commit dfb8be3017
6 changed files with 311 additions and 104 deletions
--- a/srcs/main.cpp
+++ b/srcs/main.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <exception>
 #include <stdexcept>
-#include <Webserv.hpp>
+#include "Webserv.hpp"

 int	main(int ac, char **av)
 {