diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
| commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
| tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /doc | |
| parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
DRTVWR-489: trivial merge conflict fix
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 8355902f83..7106f4ef9c 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1190,6 +1190,7 @@ PanteraPolnocy SL-18891 SL-18904 SL-18937 + SL-19681 Parvati Silverweb Patric Mills VWR-2645 @@ -1414,6 +1415,7 @@ Sovereign Engineer SL-18497 SL-18525 SL-18534 + SL-19336 SpacedOut Frye VWR-34 VWR-45 |