jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rectif makefile

Browse source
This commit is contained in:
wescande 2017-03-03 18:01:25 +01:00
parent e9d0324189
commit d146126135
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
42sh/Makefile
View file

@ -6,11 +6,7 @@
# By: wescande <wescande@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2016/08/29 21:32:58 by wescande #+# #+# #
<<<<<<< HEAD
# Updated: 2017/03/03 14:36:32 by ariard ### ########.fr #
=======
# Updated: 2017/03/02 16:23:48 by jhalford ### ########.fr #
>>>>>>> pda_execution
# Updated: 2017/03/03 18:00:59 by wescande ### ########.fr #
# #
# **************************************************************************** #