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/2
+++ b/2
@@ -17,6 +17,8 @@ HEADERS =	Webserv.hpp \
 			ConfigParser.hpp \
 			ServerConfig.hpp \
 			LocationConfig.hpp \
+			Client.hpp \
+			Server.hpp \

 DEPENDENCIES =	$(HEADERS:%=$(HEADERS_D)/%)