Release 7.0.3

rei-vilo · Dec 1, 2023 · 91c8b4c · 91c8b4c
1 parent b9a404f
commit 91c8b4c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,8 @@ img/
 .github/
 *.ctu-info
 *.dump
-doxygen-awesome-css/
+<<<<<<< Updated upstream
+doxygen-awesome-css/
+=======
+doxygen-awesome-css/
+>>>>>>> Stashed changes
diff --git a/src/hV_Documentation.h b/src/hV_Documentation.h
@@ -96,6 +96,7 @@
 /// @image latex Global.jpeg width=8cm
 ///     * Example_Fast_Speed.ino
 /// @image html Fast.jpeg
+<<<<<<< Updated upstream
 /// @image latex Fast.jpeg width=8cm
 ///
 /// + Black-White-Red-Yellow
@@ -108,5 +109,16 @@
 ///     * BWRY_Contrasts.ino
 /// @image html BWRY_Contrasts.jpg
 /// @image latex BWRY_Contrasts.jpg width=8cm
+=======
+/// + Fast
+/// @image latex Fast.jpeg width=10cm
+/// + Black-White-Red-Yellow
+///     * BWRY_Colours
+/// @image html BWRY_Colours.png
+/// @image latex BWRY_Colours.png width=10cm
+///     * BWRY_Palette
+/// @image html BWRY_Palette.png
+/// @image latex BWRY_Palette.png width=10cm
+>>>>>>> Stashed changes
 ///