Fix conflict.

2025-12-06 17:27:52 +00:00 · 2013-07-07 15:13:38 -07:00
parent fca9a4abe4
commit f9b282b424
1 changed files with 0 additions and 4 deletions
--- 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)