Reverting wallet2.cpp to proper bugfix

src/wallet/wallet2.cpp

@@ -38,18 +38,13 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_
   uint64_t tx_money_got_in_outs = 0;
   crypto::public_key tx_pub_key = null_pkey;
   bool r = parse_and_validate_tx_extra(tx, tx_pub_key);
-<<<<<<< HEAD
-  // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx);
-=======
   
   // Temporarily disabled due to messed up tx_extra from someone
   // screwing around with MMing. 2014-04-30
-  
   // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx);
   
   // We don't know how to handle this weird tx, so return
   if (!r) return;
->>>>>>> 9c70be0e77c3e0b9f4a06c962203d049851b6cc5
 
   r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs);
   THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys());