raphael/ft_irc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conflicts fixed

Browse source
This commit is contained in:
Samy Ben Tayeb 2025-05-20 17:24:42 +02:00
parent e5e1afae50
commit 8f1d0b3e8a
6 changed files with 21 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,4 +1,4 @@
x# **************************************************************************** #
# **************************************************************************** #
# #
# ::: :::::::: #
# Makefile :+: :+: :+: #
@ -6,7 +6,7 @@ x# ****************************************************************************
# By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/05/02 15:40:00 by rparodi #+# #+# #
# Updated: 2025/05/20 17:06:30 by sben-tay ### ########.fr #
# Updated: 2025/05/20 17:19:13 by sben-tay ### ########.fr #
# #
# **************************************************************************** #
@ -28,7 +28,7 @@ SRC = sources/core/main.cpp \
sources/core/Server.cpp \
sources/core/check.cpp \
sources/core/parser.cpp \
sources/core/PollManager.cpp \
sources/core/PollManager.cpp
INC_DIR = include/core \