From 158e2cfd38b43bdeff17ceadcf8a1436713d5ad9 Mon Sep 17 00:00:00 2001
From: Alexandre Bobkov <alexandre.bobkov@gmail.com>
Date: Sun, 29 Jun 2025 18:19:14 -0400
Subject: [PATCH] ESP-NOW RC Tutorial

 Changes to be committed:
	modified:   ESP-IDF_Robot/tutorial/docs/build/simplepdf/.buildinfo
---
 ESP-IDF_Robot/tutorial/docs/build/simplepdf/.buildinfo | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ESP-IDF_Robot/tutorial/docs/build/simplepdf/.buildinfo b/ESP-IDF_Robot/tutorial/docs/build/simplepdf/.buildinfo
index a59b004f6..fffe89f2e 100644
--- a/ESP-IDF_Robot/tutorial/docs/build/simplepdf/.buildinfo
+++ b/ESP-IDF_Robot/tutorial/docs/build/simplepdf/.buildinfo
@@ -1,4 +1,8 @@
 # Sphinx build info version 1
 # This file records the configuration used when building these files. When it is not found, a full rebuild will be done.
+<<<<<<< HEAD
 config: 4f54c0f33877e711e23f5a71bc9f3f82
+=======
+config: 34b807d057aebea19eb0d483031b2c22
+>>>>>>> 28649fd85 (ESP-NOW RC Tutorial)
 tags: 62a1e7829a13fc7881b6498c52484ec0