git is too much complex for me

2019-09-02 11:51:47 +02:00
parent f0c704a818 776c3e9dbd
commit 262a7336ab
2 changed files with 48 additions and 0 deletions
--- a/v4l2/grabvidseq.c
+++ b/v4l2/grabvidseq.c
@@ -36,6 +36,12 @@
 #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))