| commit | 96d3a51f4678c08b12562ed4074aeab7e08e9035 | [log] [tgz] |
|---|---|---|
| author | Arthur She <arthur.she@linaro.org> | Mon Dec 25 10:39:38 2023 -0700 |
| committer | Arthur She <arthur.she@linaro.org> | Sun Jan 07 23:17:13 2024 +0100 |
| tree | f76d1260cc43681cc3c91dae2e964b9cf6992cf4 | |
| parent | 805c5124d759123e92cfa50ae0891c15016811e5 [diff] |
Patch 1 Signed-off-by: Arthur She <arthur.she@linaro.org> Change-Id: I56a5908eb8a710aee218ab36768def438b6d88a1
diff --git a/test.txt b/test.txt index cc4aef9..238b60d 100644 --- a/test.txt +++ b/test.txt
@@ -1,7 +1,12 @@ 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 1