finish

Author: ncooke3

.github/workflows/analytics.yml

@@ -63,7 +63,6 @@ jobs:
       DEVICE: ${{ matrix.device }}
       SCHEME: ${{ matrix.scheme }}
       DIR: analytics
-      XCODE_VERSION: ${{ matrix.xcode }}
     steps:
       - name: Checkout
         uses: actions/checkout@master

.github/workflows/firebaseai.yml

@@ -42,11 +42,6 @@ jobs:
       OS: ${{ matrix.platform }}
       DEVICE: ${{ matrix.device }}
       TEST: false
-<<<<<<< Updated upstream
-      XCODE_VERSION: ${{ matrix.xcode }}
-=======
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
->>>>>>> Stashed changes
     steps:
       - name: Checkout
         uses: actions/checkout@master

.github/workflows/functions.yml

@@ -51,11 +51,6 @@ jobs:
       OS: ${{ matrix.os }}
       DEVICE: ${{ matrix.device }}
       TEST: false
-<<<<<<< Updated upstream
-      XCODE_VERSION: ${{ matrix.xcode }}
-=======
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
->>>>>>> Stashed changes
     steps:
       - name: Checkout
         uses: actions/checkout@master

.github/workflows/performance.yml

@@ -77,11 +77,6 @@ jobs:
       OS: ${{ matrix.os }}
       DEVICE: ${{ matrix.device }}
       TEST: ${{ matrix.test }}
-<<<<<<< Updated upstream
-      XCODE_VERSION: ${{ matrix.xcode }}
-=======
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
->>>>>>> Stashed changes
     steps:
       - name: Checkout
         uses: actions/checkout@master

.github/workflows/storage.yml

@@ -77,11 +77,6 @@ jobs:
       OS: ${{ matrix.os }}
       DEVICE: ${{ matrix.device }}
       TEST: false
-<<<<<<< Updated upstream
-      XCODE_VERSION: ${{ matrix.xcode }}
-=======
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
->>>>>>> Stashed changes
     steps:
       - name: Checkout
         uses: actions/checkout@master