| commit | ae292e436332d7b96add3477277c0aceb440a9d5 | [log] [tgz] |
|---|---|---|
| author | Arthur She <arthur.she@linaro.org> | Wed Mar 27 20:26:14 2024 -0700 |
| committer | Arthur She <arthur.she@linaro.org> | Wed Mar 27 20:26:14 2024 -0700 |
| tree | 53d2f3c60613fd20e81d742bdbf64d2ae61367b1 | |
| parent | 99ebb7ff2c19647b151f4a569565f1c186e94af2 [diff] |
Update master branch Signed-off-by: Arthur She <arthur.she@linaro.org> Change-Id: I5b2cff4b9b654b20a29e845b4263d335eb03dcb5
diff --git a/test.txt b/test.txt index c95bb07..54fc7b1 100644 --- a/test.txt +++ b/test.txt
@@ -1,10 +1,7 @@ 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