fix conflict

examples/lvgl_ssd1306/lv_conf.h

@@ -38,7 +38,11 @@
  * Required for buffered drawing, opacity and anti-aliasing
  * VDB makes the double buffering, you don't need to deal with it!
  * Typical size: ~1/10 screen */
+<<<<<<< HEAD
 #define LV_VDB_SIZE         (LV_VER_RES * LV_HOR_RES / 2)  /*Size of VDB in pixel count (1/10 screen size is good for first)*/
+=======
+#define LV_VDB_SIZE         (LV_VER_RES * LV_HOR_RES)  /*Size of VDB in pixel count (1/10 screen size is good for first)*/
+>>>>>>> 75d149a2dc6dfce19d031f0062431ba150fc0b5d
 #define LV_VDB_PX_BPP       1     /*Bit-per-pixel of VDB. Useful for monochrome or non-standard color format displays. (Set `disp_drv->vdb_wr` and `disp_drv->vdb_rd` too)*/
 #define LV_VDB_ADR          0                 /*Place VDB to a specific address (e.g. in external RAM) (0: allocate automatically into RAM; LV_VDB_ADR_INV: to replace it later with `lv_vdb_set_adr()`)*/
 

examples/lvgl_ssd1306/main.c

@@ -67,12 +67,16 @@ static void ssd1306_task(void *pvParameters)
     lv_style_copy(&style, &lv_style_transp);
     style.text.font = &lv_font_dejavu_10;   /*Unicode and symbol fonts already assigned by the library*/
     style.text.color.full = 1;
+<<<<<<< HEAD
     style.text.opa = 255;
 
+=======
+>>>>>>> 75d149a2dc6dfce19d031f0062431ba150fc0b5d
     style.body.main_color.full = 0;
     style.body.grad_color.full = 0;
     style.body.shadow.color.full = 0;
     style.body.border.color.full = 0;
+<<<<<<< HEAD
     style.body.empty = 1;
 
     style.image.color.full = 1;
@@ -83,6 +87,9 @@ static void ssd1306_task(void *pvParameters)
     style.line.opa = 255;
     style.line.width = 1;
     style.line.rounded = false;
+=======
+    style.body.empty = 0;
+>>>>>>> 75d149a2dc6dfce19d031f0062431ba150fc0b5d
 
     //Create main screen obj
     lv_obj_t * scr = lv_obj_create(NULL, NULL);