fix rebase

dulvui · Feb 22, 2023 · da0b5b8 · da0b5b8
1 parent 7659ad8
commit da0b5b8
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/action.yml b/action.yml
@@ -91,13 +91,6 @@ runs:
         echo ${{ inputs.godot-version }}.stable >> ${{ inputs.working-directory }}/android/.build_version
         unzip ~/.local/share/godot/templates/${{ inputs.godot-version }}.stable/android_source.zip  -d ${{ inputs.working-directory }}/android/build
 
-<<<<<<< HEAD
-=======
-    - name: Open game in editor once to load assets
-      shell: bash
-      run: godot -e -q --path ${{ inputs.working-directory }}
-
->>>>>>> 6789be0 (add changes-not-sent-for-review parameter)
     - name: Export
       shell: bash
       run: godot --path ${{ inputs.working-directory }} --export Android