je comprend plus rien au brotch...

v4l2/grabvidseq.c

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