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

merge fix

Browse source
This commit is contained in:
Jack Halford 2016-11-16 10:58:30 +01:00
parent 3f2c70bb04
commit b7ce8460ff
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libftasm/includes/libft.h
View file

@ -6,11 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */
<<<<<<< HEAD
/* Updated: 2016/11/16 10:53:34 by jhalford ### ########.fr */
=======
/* Updated: 2016/11/14 16:31:04 by jhalford ### ########.fr */
>>>>>>> a3f7d30e3fc482af179207682b48ae052d422bdf
/* Updated: 2016/11/16 10:58:19 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
libftasm/src/ft_printf/ft_printf.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/07 13:33:27 by jhalford #+# #+# */
/* Updated: 2016/11/16 10:57:25 by jhalford ### ########.fr */
/* Updated: 2016/11/16 10:58:04 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */