fix feather esp32-s2 name (it has psram!) and add tft variant

Author: ladyada

boards.txt

@@ -4415,7 +4415,6 @@ adafruit_feather_esp32s2.build.mcu=esp32s2
 adafruit_feather_esp32s2.build.core=esp32
 adafruit_feather_esp32s2.build.variant=adafruit_feather_esp32s2
 adafruit_feather_esp32s2.build.board=ADAFRUIT_FEATHER_ESP32S2
-
 adafruit_feather_esp32s2.build.cdc_on_boot=1
 adafruit_feather_esp32s2.build.msc_on_boot=0
 adafruit_feather_esp32s2.build.dfu_on_boot=0
@@ -4557,9 +4556,15 @@ adafruit_feather_esp32s2.menu.DebugLevel.debug=Debug
 adafruit_feather_esp32s2.menu.DebugLevel.debug.build.code_debug=4
 adafruit_feather_esp32s2.menu.DebugLevel.verbose=Verbose
 adafruit_feather_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
+<<<<<<< HEAD
+
+##############################################################
+
+=======
 
 ##############################################################
 
+>>>>>>> ed84c4b3 (fix feather esp32-s2 name (it has psram!) and add tft variant)
 adafruit_feather_esp32s2_tft.name=Adafruit Feather ESP32-S2 TFT
 adafruit_feather_esp32s2_tft.vid.0=0x239A
 adafruit_feather_esp32s2_tft.pid.0=0x810F
@@ -4721,6 +4726,7 @@ adafruit_feather_esp32s2_tft.menu.DebugLevel.debug=Debug
 adafruit_feather_esp32s2_tft.menu.DebugLevel.debug.build.code_debug=4
 adafruit_feather_esp32s2_tft.menu.DebugLevel.verbose=Verbose
 adafruit_feather_esp32s2_tft.menu.DebugLevel.verbose.build.code_debug=5
+<<<<<<< HEAD
 
 ##############################################################
 
@@ -4885,6 +4891,8 @@ adafruit_qtpy_esp32s2.menu.DebugLevel.debug=Debug
 adafruit_qtpy_esp32s2.menu.DebugLevel.debug.build.code_debug=4
 adafruit_qtpy_esp32s2.menu.DebugLevel.verbose=Verbose
 adafruit_qtpy_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
+=======
+>>>>>>> ed84c4b3 (fix feather esp32-s2 name (it has psram!) and add tft variant)
 
 ##############################################################