diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-01-25 15:53:43 -0800 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-01-25 15:53:43 -0800 |
| commit | 760c6a996a594ecc68e06fac79f6093fd5d5ee6d (patch) | |
| tree | 262276cd420e255c4d87f7a5a1c7b39391b928a9 /doc/contributions.txt | |
| parent | ef4c7c124753ca93659e34c6bbf0f6ef0ca208e7 (diff) | |
SL-14705: Fix merge conflict
Diffstat (limited to 'doc/contributions.txt')
| -rwxr-xr-x | doc/contributions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3e458e9476..81c44d2961 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1354,6 +1354,7 @@ Sovereign Engineer SL-11079 OPEN-343 SL-11625 + SL-14705 SL-14707 SpacedOut Frye VWR-34 |