From a7c64bf936be1f6c4832a854413c5c06cdec7805 Mon Sep 17 00:00:00 2001
From: johnvizzz <john.vizzeri@proton.me>
Date: Wed, 18 Jan 2023 18:25:11 +0100
Subject: [PATCH] fix api_symbols.csv

---
 firmware/targets/f7/api_symbols.csv | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 42ea150df..877e20b05 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -603,7 +603,15 @@ Function,+,byte_input_set_result_callback,void,"ByteInput*, ByteInputCallback, B
 Function,-,bzero,void,"void*, size_t"
 Function,-,calloc,void*,"size_t, size_t"
 Function,+,canvas_clear,void,Canvas*
+<<<<<<< HEAD
 Function,+,canvas_commit,void,Canvas*
+=======
+<<<<<<< HEAD
+Function,-,canvas_commit,void,Canvas*
+=======
+Function,+,canvas_commit,void,Canvas*
+>>>>>>> b11b9f1b3 (Gui: Direct Draw API (#2215))
+>>>>>>> e04f2b4ce (api_symbols)
 Function,+,canvas_current_font_height,uint8_t,Canvas*
 Function,+,canvas_draw_bitmap,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*"
 Function,+,canvas_draw_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t"
@@ -632,7 +640,15 @@ Function,+,canvas_glyph_width,uint8_t,"Canvas*, char"
 Function,+,canvas_height,uint8_t,Canvas*
 Function,-,canvas_init,Canvas*,
 Function,+,canvas_invert_color,void,Canvas*
+<<<<<<< HEAD
 Function,+,canvas_reset,void,Canvas*
+=======
+<<<<<<< HEAD
+Function,-,canvas_reset,void,Canvas*
+=======
+Function,+,canvas_reset,void,Canvas*
+>>>>>>> b11b9f1b3 (Gui: Direct Draw API (#2215))
+>>>>>>> e04f2b4ce (api_symbols)
 Function,+,canvas_set_bitmap_mode,void,"Canvas*, _Bool"
 Function,+,canvas_set_color,void,"Canvas*, Color"
 Function,+,canvas_set_font,void,"Canvas*, Font"