From 43ae80491d3dcd88ed56234e970317ab5e4e1484 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Fri, 29 Nov 2013 19:36:58 -0700
Subject: [PATCH] Remove duplicate code from merge

---
 indra/newview/llfloaterpreference.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 4124362269..cb145bd0aa 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -840,11 +840,6 @@ void LLFloaterPreference::cancel()
 	// hide spellchecker settings folder
 	LLFloaterReg::hideInstance("prefs_spellchecker");
 	
-// <FS:CR> STORM-1888
-	// hide spellchecker settings floater
-	LLFloaterReg::hideInstance("prefs_spellchecker");
-// </FS:CR>
-	
 	// cancel hardware menu
 	LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
 	if (hardware_settings)