ci 3

.github/workflows/qt.yml

@@ -59,26 +59,18 @@ jobs:
         run: |
           qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} "QT_TOOL_PATH=${{steps.qt.outputs.qtdir}}/Tools" nut.pro
           ${{steps.qt.outputs.make}} qmake_all
-<<<<<<< HEAD
-      - name: make module
+      - name: make lib
         run: |
           ${{steps.qt.outputs.make}}
           ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install
-=======
-        
->>>>>>> 29aaab8228f2f4c9d7c6651941f6614130c02d1d
-      - name: upload module to releases
+      - name: upload lib to releases
         uses: Skycoder42/action-upload-release@master
         if: startsWith(github.ref, 'refs/tags/')
         with:
           repo_token: ${{secrets.GITHUB_TOKEN}}
           directory: ${{steps.qt.outputs.outdir}}
           platform: ${{matrix.platform}}
-<<<<<<< HEAD
           asset_name: nut-${{matrix.platform}}-${{matrix.version}}
-=======
-          asset_name: qtautoupdater-${{matrix.platform}}-${{matrix.version}}
->>>>>>> 29aaab8228f2f4c9d7c6651941f6614130c02d1d
           tag: ${{github.ref}}
           overwrite: true