mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'DAO' into disk-protobuffer

Browse source 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	common/src/main/java/io/bisq/common/storage/FileManager.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	gui/src/main/java/io/bisq/gui/app/BisqAppModule.java
	seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
This commit is contained in:
Mike Rosseel 2017-04-18 09:36:20 +02:00
parent b878389c25
commit f9634ce052
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/io/bisq/common/storage/FileManager.java
View file

@ -117,11 +117,7 @@ public class FileManager<T extends Persistable> {
}
if (persistable.isPresent()) {
<<<<<<< HEAD
log.info("Reading Persistable: {}", persistable.get().getClass());
=======
log.debug("Persistable found");
>>>>>>> DAO
//noinspection unchecked
return (T) persistable.get();
}