Fix typo in esp32s2 github action builder

Michael O'Cleirigh · Michael O'Cleirigh · commit bc17e2652fc4 · 2022-12-18T18:27:46.000-05:00
diff --git a/.github/workflows/build_esp32s2.yml b/.github/workflows/build_esp32s2.yml
@@ -12,11 +12,7 @@ on:
       - '.github/workflows/build_unix.yml'
 
 jobs:
-<<<<<<< HEAD
-  tensorflow_micropython_esp32s2_build:
-=======
   tensorflow_micropython_esp32_s2_build:
->>>>>>> Changes all esp32 builds to build and publish firmware.bin files
     runs-on: ubuntu-latest
 
     steps:
