Update gradle.yml

thewiilover · Sep 15, 2024 · e215767 · e215767
1 parent 0dcb75f
commit e215767
Showing 1 changed file with 0 additions and 19 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -40,17 +40,11 @@ jobs:
         local-cache: true
         link-to-sdk: true
     - name: Make Gradle wrapper executable and pull LFS
-<<<<<<< HEAD
-      run: git lfs pull | chmod +x ./gradlew
-=======
       run: git lfs pull
->>>>>>> f218378a8cc7fcd40b18c0361aa9ad4926dc9ae4
     - name: Build with Gradle
       uses: gradle/gradle-build-action@v2
       with:
         arguments: build
-
-<<<<<<< HEAD
     - name: Upload debug
       uses: actions/upload-artifact@v3
       with:
@@ -61,16 +55,3 @@ jobs:
       with:
           name: app-debug
           path: wrapper/launcher/build/outputs/apk/release/*
-
-=======
-    - name: Upload Debug
-      uses: actions/upload-artifact@v3
-      with:
-          name: app-debug
-          path: wrapper/launcher/build/outputs/apk/debug/*
-    - name: Upload Release
-      uses: actions/upload-artifact@v3
-      with:
-          name: app-release
-          path: wrapper/launcher/build/outputs/apk/release/*
->>>>>>> f218378a8cc7fcd40b18c0361aa9ad4926dc9ae4