From f9b282b424207fa1525cb68a2350896b86e0a5ed Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sun, 7 Jul 2013 15:13:38 -0700 Subject: [PATCH] Fix conflict. --- modules/ripple_basics/containers/ripple_RangeSet.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/ripple_basics/containers/ripple_RangeSet.cpp b/modules/ripple_basics/containers/ripple_RangeSet.cpp index 980b5b82c..521d207c4 100644 --- a/modules/ripple_basics/containers/ripple_RangeSet.cpp +++ b/modules/ripple_basics/containers/ripple_RangeSet.cpp @@ -162,13 +162,9 @@ void RangeSet::clearValue (uint32 v) } else { -<<<<<<< HEAD uint32 oldEnd = it->second; mRanges.erase(it); mRanges[v + 1] = oldEnd; -======= - ++ (it->first); ->>>>>>> 89b4d70... Fix a bug in RangeSet::clearValue } } else if (it->second == v)