mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Bump netlayerVersion to  0.6.5.1
This commit is contained in:
ghubstan 2019-08-09 14:49:12 -03:00
parent 2709e61875
commit 623a1db1e7
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@ -223,17 +223,10 @@ configure(project(':common')) {
configure(project(':p2p')) {
dependencies {
compile project(':common')
<<<<<<< HEAD
compile("com.github.JesusMcCloud.netlayer:tor.native:$netlayerVersion") {
exclude(module: 'slf4j-api')
}
compile("com.github.JesusMcCloud.netlayer:tor.external:$netlayerVersion") {
=======
compile('com.github.JesusMcCloud.netlayer:tor.native:0.6.5.1') {
exclude(module: 'slf4j-api')
}
compile('com.github.JesusMcCloud.netlayer:tor.external:0.6.5.1') {
>>>>>>> upstream/master
exclude(module: 'slf4j-api')
}
compile("org.apache.httpcomponents:httpclient:$httpclientVersion") {