| commit | b87661f6d4fe525d40f42797b58f45b8ac7628d3 | [log] [tgz] |
|---|---|---|
| author | Arthur She <arthur.she@linaro.org> | Tue Jan 30 20:59:43 2024 -0800 |
| committer | Arthur She <arthur.she@linaro.org> | Tue Jan 30 20:59:43 2024 -0800 |
| tree | e32328765cbc5abb00c8958056bba66cb91cf8eb | |
| parent | 99ebb7ff2c19647b151f4a569565f1c186e94af2 [diff] [blame] |
lts-v3.6 branch P1 Signed-off-by: Arthur She <arthur.she@linaro.org> Change-Id: Icb06c82cbaf12e52265c92a2018a6de071812cf8
diff --git a/test.txt b/test.txt index c95bb07..caf4964 100644 --- a/test.txt +++ b/test.txt
@@ -1,12 +1 @@ -Test file -Test push -<<<<<<< PATCH SET (bf6258 Patch 1) -======= -Test 3 -Test 5 ->>>>>>> BASE (805c51 Update .readthedocs.yaml to install sphinx_rtd_theme) - -Trigger job -Update master branch - -This is patch 3 +lts-v3.6 branch P1