From 760c6a996a594ecc68e06fac79f6093fd5d5ee6d Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Mon, 25 Jan 2021 15:53:43 -0800
Subject: SL-14705: Fix merge conflict

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.3