[FOLD] Address rebase conflicts

XRPLF · Jul 12, 2017 · 4229ed6 · 4229ed6
1 parent 322342c
commit 4229ed6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/ripple/consensus/Consensus.h b/src/ripple/consensus/Consensus.h
@@ -1376,9 +1376,7 @@ Consensus<Adaptor>::updateOurPositions()
             {
                 Proposal_t const& p = it.second.proposal();
                 if (p.position() == newID)
-                {
                     updateDisputes(it.first, result_->set);
-                }
             }
         }
 

diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h
@@ -206,7 +206,7 @@ struct Peer
         , id{i}
         , net{n}
         , unl(u)
-        , parms_{p}
+        , parms_(p)
     {
         ledgers[lastClosedLedger.id()] = lastClosedLedger;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1376,9 +1376,7 @@ Consensus<Adaptor>::updateOurPositions() @@
                 {
                     Proposal_t const& p = it.second.proposal();
                     if (p.position() == newID)
-                    {
                         updateDisputes(it.first, result_->set);
-                    }
                 }
             }
@@ Expand Down @@