From bad6aa7f6b0527e2fc75f9321f640baaa32157c0 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 8 Nov 2010 13:34:24 -0500
Subject: Fix for manual merge errors.

---
 indra/newview/llviewerwindow.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 12701b4fce..573fb1a8b5 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -668,7 +668,6 @@ public:
 
 			ypos += y_inc;
 		}
-		}
 	}
 
 	void draw()
-- 
cgit v1.2.3