Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-30 01:27:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merged seedpeer branch with master branch

Browse source 
Conflicts:
	src/main/java/io/bitsquare/BitSquare.java
	src/main/java/io/bitsquare/gui/main/MainModel.java
This commit is contained in:
Steve Myers 2014-10-12 13:07:28 -07:00
commit f8b9408514
27 changed files with 560 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/io/bitsquare/di/BitSquareModule.java
View file

@ -146,7 +146,7 @@ class NetworkParametersProvider implements Provider<NetworkParameters> {
// Set default
// String networkType= WalletFacade.MAIN_NET;
// String networkType = WalletFacade.TEST_NET;
//String networkType = WalletFacade.TEST_NET;
String networkType = WalletFacade.REG_TEST_NET;
if (networkTypeFromConfig != null)