rectif makefile
This commit is contained in:
parent
e9d0324189
commit
d146126135
1 changed files with 1 additions and 5 deletions
|
|
@ -6,11 +6,7 @@
|
||||||
# By: wescande <wescande@student.42.fr> +#+ +:+ +#+ #
|
# By: wescande <wescande@student.42.fr> +#+ +:+ +#+ #
|
||||||
# +#+#+#+#+#+ +#+ #
|
# +#+#+#+#+#+ +#+ #
|
||||||
# Created: 2016/08/29 21:32:58 by wescande #+# #+# #
|
# Created: 2016/08/29 21:32:58 by wescande #+# #+# #
|
||||||
<<<<<<< HEAD
|
# Updated: 2017/03/03 18:00:59 by wescande ### ########.fr #
|
||||||
# Updated: 2017/03/03 14:36:32 by ariard ### ########.fr #
|
|
||||||
=======
|
|
||||||
# Updated: 2017/03/02 16:23:48 by jhalford ### ########.fr #
|
|
||||||
>>>>>>> pda_execution
|
|
||||||
# #
|
# #
|
||||||
# **************************************************************************** #
|
# **************************************************************************** #
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue