From 58d5affe4012657053f8823c0431b9eeeefbd035 Mon Sep 17 00:00:00 2001 From: SynaptiCAD User Date: Wed, 22 Mar 2017 12:48:02 -0400 Subject: [PATCH] fix merge conflict --- libraries/chain/betting_market_evaluator.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/chain/betting_market_evaluator.cpp b/libraries/chain/betting_market_evaluator.cpp index d988cb69..02b87d3b 100644 --- a/libraries/chain/betting_market_evaluator.cpp +++ b/libraries/chain/betting_market_evaluator.cpp @@ -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) { try { -<<<<<<< 46ef911f8ec2454ea00507dabc843a994b1fc842 const database& d = db(); _betting_market = &op.betting_market_id(d);