Merge pull request #1057 from LuxCoreRender/for_v2.11

For v2.11

Author: howetuft

.github/workflows/build_bundle.yml

@@ -67,8 +67,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "BlendLuxCore"
-<<<<<<< HEAD
           path: "${{ github.workspace }}/build/out/BlendLuxCore-*.zip"
-=======
-          path: "${{ github.workspace }}/build/BlendLuxCore-*.zip"
->>>>>>> 9c294874 (Build bundle workflow: add worflow_dispatch)

ui/addon_preferences.py

@@ -144,11 +144,7 @@ def film_device_items_callback(self, context):
     lol_useragent: StringProperty(
         name="HTTP User-Agent",
         description="User Agent transmitted with requests",
-<<<<<<< HEAD
-        default=f"BlendLuxCore/{utils.get_version_string()}",
-=======
         default = f"BlendLuxCore/{version_string}",
->>>>>>> e1282839 (Remove obsolete bl_info dictionary, merge information into blender_manifest.toml and AUTHORS.txt)
     )
 
     max_assetbar_rows: IntProperty(