Merge branch 'master' into pending-transaction-datasource

2015-03-30 12:16:01 +03:00 · 2015-03-30 12:16:01 +03:00 · 6bf85643bd
parent a7b0fa1c7b 3f1ec43b3b
commit 6bf85643bd
1 changed files with 3 additions and 5 deletions
--- a/ethereumj-core/build.gradle
+++ b/ethereumj-core/build.gradle
@ -156,11 +156,9 @@ artifactory {
 }

 artifactoryPublish.onlyIf {
-//    (!pullRequest || pullRequest == 'false') &&
-//            project.version.endsWith('-SNAPSHOT') &&
-
-    
-    branchName.startsWith('master')
+    (!pullRequest || pullRequest == 'false') &&
+            project.version.endsWith('-SNAPSHOT') &&
+            branchName.startsWith('master')
 }

 bintray {