Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
SynaptiCAD User 2017-03-22 12:48:02 -04:00
parent c42a56d332
commit 58d5affe40
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/betting_market_evaluator.cpp
View file

@ -94,7 +94,6 @@ object_id_type betting_market_create_evaluator::do_apply(const betting_market_cr
void_result bet_place_evaluator::do_evaluate(const bet_place_operation& op) void_result bet_place_evaluator::do_evaluate(const bet_place_operation& op)
{ try { { try {
<<<<<<< 46ef911f8ec2454ea00507dabc843a994b1fc842
const database& d = db(); const database& d = db();
_betting_market = &op.betting_market_id(d); _betting_market = &op.betting_market_id(d);