From 3d23cbc3f4539ea1295d05626fb2ee4201a6fb39 Mon Sep 17 00:00:00 2001
From: tth <sigfood@dinorama.fr>
Date: Mon, 2 Sep 2019 12:44:58 +0200
Subject: [PATCH] je comprend plus rien au brotch...

---
 v4l2/grabvidseq.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/v4l2/grabvidseq.c b/v4l2/grabvidseq.c
index 642e1b7e..a15fc5e2 100644
--- a/v4l2/grabvidseq.c
+++ b/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))