From 2b4d3fff706d098076bb6c0a7dce2ca35b83300f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 10 Mar 2014 15:46:49 -0400
Subject: back out STORM-2011 due to conflict

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

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 16cb5c526c..f4e5ad6edb 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -180,7 +180,6 @@ Ansariel Hiller
 	MAINT-2368
 	STORM-1931
 	MAINT-2773
-	STORM-2011
 	MAINT-3187
 	BUG-3764
 	STORM-1984
-- 
cgit v1.2.3