nettoyer les scories de GIT sa race

This commit is contained in:
tonton Th 2019-09-02 12:51:59 +02:00
parent 4daa30816c
commit 19bcdd3cb5
1 changed files with 0 additions and 6 deletions

View File

@ -36,12 +36,6 @@
#define SAVE_AS_PNM 0 #define SAVE_AS_PNM 0
#define SAVE_AS_FIMG 0 #define SAVE_AS_FIMG 0
<<<<<<< HEAD
=======
#define WIDTH 720
#define HEIGHT 576
>>>>>>> 776c3e9dbda446198f7d90b4918ab3a642773239
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
#define CLEAR(x) memset(&(x), 0, sizeof(x)) #define CLEAR(x) memset(&(x), 0, sizeof(x))