resolved conflict with 'develop' of https://github.com/mbg033/monero

This commit is contained in:
Ilya Kitaev 2016-10-07 00:36:36 +03:00
commit a4390dae07

View file

@ -207,6 +207,3 @@ void TransactionHistoryImpl::refresh()
} }
} }
}