Merge branch 'master' of github.com:monero-project/bitmonero

2014-04-30 16:55:49 -04:00 · 2014-04-30 16:55:49 -04:00 · 0f42b2eba6
parent 79a4bedc36 504bdddcb5
commit 0f42b2eba6
1 changed files with 0 additions and 1 deletions
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@ -41,7 +41,6 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_
  
  // 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