diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-28 11:52:16 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-28 11:52:16 -0400 |
| commit | fe4f85e587fc01319f0570541394eeca57273ba2 (patch) | |
| tree | a3abfa235b1aad022fa5d262a60d639282635bc8 /.github | |
| parent | aeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff) | |
| parent | de8275b14b30bf754cdba1da867cb2e6c2783639 (diff) | |
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/.gitattributes | 1 | ||||
| -rw-r--r-- | .github/workflows/qatest.yaml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/.gitattributes b/.github/workflows/.gitattributes new file mode 100644 index 0000000000..6dc1cca42a --- /dev/null +++ b/.github/workflows/.gitattributes @@ -0,0 +1 @@ +qatest.yaml -text eol=crlf diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml index 14530ec824..b8047d2251 100644 --- a/.github/workflows/qatest.yaml +++ b/.github/workflows/qatest.yaml @@ -572,4 +572,4 @@ jobs: # uses: actions/upload-artifact@v4 # with: # name: test-results-${{ matrix.runner }} - # path: ${{ matrix.install-path }}/regressionTest/test_results.html + # path: ${{ matrix.install-path }}/regressionTest/test_results.html
\ No newline at end of file |