From 186b60457808d5fb280531bc96aba8fc8b67ef12 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 9 May 2013 10:22:10 -0400
Subject: remove duplications and other errors introduced during the merge

---
 indra/llcommon/llfasttimer.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/llcommon/llfasttimer.cpp')

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index ec94691cae..9b15804e97 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -567,12 +567,6 @@ LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer()
         return *NamedTimerFactory::instance().getRootTimer();
 }
 
-//static
-LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer()
-{
-        return *NamedTimerFactory::instance().getRootTimer();
-}
-
 //static
 void LLFastTimer::nextFrame()
 {
-- 
cgit v1.2.3