Update SAE

2021-12-07 15:05:54 +01:00 · 2021-12-07 15:05:54 +01:00 · 4986d63d32
commit 4986d63d32
parent 3c0440e3bd dbf5cd2057
2 changed files with 3 additions and 4 deletions
--- a/APL1.1/SAE11_2021/main.c
+++ b/APL1.1/SAE11_2021/main.c
@ -7,7 +7,10 @@
 #include "graph_sup.h"

 #include "taquin.h"
+<<<<<<< HEAD
 #include "menu.h"
+=======
+>>>>>>> dbf5cd20576dc4c4a48593bdccdfb0fe959dcf34

 int main(int argc, char* argv[]) {
 	InitialiserGraphique();
--- a/APL1.1/SAE11_2021/menu.h
+++ b/APL1.1/SAE11_2021/menu.h
@ -1,4 +0,0 @@
-#ifndef _MENU_H
-#define _MENU_H
-
-#endif