Fix merge conflicts

Author: makermelissa

_board/espressif_esp32s3_box_lite.md

@@ -7,7 +7,11 @@ manufacturer: "Espressif"
 board_url:
  - "https://www.adafruit.com/product/5511"
 board_image: "espressif_esp32s3_box_lite.jpg"
+<<<<<<< HEAD
 date_added: 2022-7-08
+=======
+date_added: 2022-07-08
+>>>>>>> 3d693274c3dcb32e2dfaf508f90b599667e5e843
 family: esp32s3
 features:
   - Wi-Fi

_board/lilygo_tdisplay_s3.md

@@ -7,7 +7,7 @@ manufacturer: "LILYGO"
 board_url:
  - "https://www.lilygo.cc/products/t-display-s3"
 board_image: "lilygo_tdisplay_s3.jpg"
-date_added: 2024-3-9
+date_added: 2024-3-09
 family: esp32s3
 features:
   - Wi-Fi

feed.html

@@ -8,8 +8,8 @@
 <link>{{ "/" | absolute_url }}</link>
 <description>A list of CircuitPython and Blinka supported boards</description>
 <lastBuildDate>{{ "now" | date_to_rfc822 }}</lastBuildDate>
-{% assign cp_boards = site.board | sort: 'date_added' | reverse %}
-{% for board in cp_boards %}
+{% assign chronological_boards = site.board | sort: "date_added" %}
+{% for board in chronological_boards reversed %}
   {%- if board.downloads_display == false -%}
     {%- continue -%}
   {%- endif -%}
@@ -24,8 +24,8 @@
   </item>
   {%- endif -%}
 {% endfor %}
-{% assign blinka_boards = site.board | sort: 'date_added' | reverse %}
-{% for board in blinka_boards %}
+{% assign chronological_blinka_boards = site.board | sort: "date_added" %}
+{% for board in chronological_blinka_boards reversed %}
     <item>
       <title>{{ board.name }}</title>
       <link>{{ board.url | absolute_url }}</link>