Skip to content
Snippets Groups Projects
Commit 6dd3f549 authored by callum's avatar callum
Browse files

Simple fix for Hg merge tool shittiness..

parent 532a8ed0
Branches
Tags
No related merge requests found
......@@ -268,8 +268,6 @@ const std::string LLFloaterMediaSettings::getHomeUrl()
return std::string( "" );
}
}
////////////////////////////////////////////////////////////////////////////////
// virtual
void LLFloaterMediaSettings::draw()
......@@ -301,3 +299,5 @@ void LLFloaterMediaSettings::draw()
enableOkApplyBtns(values_changed);
LLFloater::draw();
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment