Remove conflict marker that snuck past

EOSIO · Aug 8, 2017 · 4adbf0b · 4adbf0b
1 parent a210f9c
commit 4adbf0b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/libraries/chain/include/eos/chain/message_handling_contexts.hpp b/libraries/chain/include/eos/chain/message_handling_contexts.hpp
@@ -28,7 +28,6 @@ class apply_context {
 
    int32_t load_i64( Name scope, Name code, Name table, Name Key, char* data, uint32_t maxlen );
 
-<<<<<<< HEAD
    int32_t front_primary_i128i128( Name scope, Name code, Name table,
                                    uint128_t* primary, uint128_t* secondary, char* data, uint32_t maxlen );
    int32_t back_primary_i128i128( Name scope, Name code, Name table,