Przeglądaj źródła

merge conflicts

CaCO3 2 lat temu
rodzic
commit
a20fec1094
1 zmienionych plików z 0 dodań i 14 usunięć
  1. 0 14
      Changelog.md

+ 0 - 14
Changelog.md

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 ## [15.2.0] - 2023-04-23
-=======
-## [15.1.1] - 2023-03-23
->>>>>>> master
 
 ### Update Procedure
 
@@ -10,7 +6,6 @@ Update Procedure see [online documentation](https://jomjol.github.io/AI-on-the-e
 
 ### Changes
 
-<<<<<<< HEAD
 For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.2.0)
 
 #### Added
@@ -48,12 +43,6 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
 
 #### Added
 
-=======
-For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1)
-
-#### Added
-
->>>>>>> master
 - [#2206](https://github.com/jomjol/AI-on-the-edge-device/pull/2206) Log PSRAM usage
 - [#2216](https://github.com/jomjol/AI-on-the-edge-device/pull/2216) Log MQTT connection refused reasons
 
@@ -977,10 +966,7 @@ External Illumination
 -   Initial Version
 
 
-<<<<<<< HEAD
 [15.2.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.1.2
-=======
->>>>>>> master
 [15.1.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1
 [15.1.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.0.3...v15.1.0
 [15.0.3]: https://github.com/jomjol/AI-on-the-edge-device/compare/v14.0.3...v15.0.3