remove Gradle Wrapper conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/347d558d Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/347d558d Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/347d558d Branch: refs/heads/master Commit: 347d558dc951b9fd5898ef996812e82501df26d6 Parents: cc6c0ca 17c8bc7 Author: Sagar <[email protected]> Authored: Mon Jun 13 15:07:58 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jun 13 15:07:58 2016 +0530 ---------------------------------------------------------------------- .travis.yml | 30 +++++++++++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 1 + 2 files changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/347d558d/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --cc gradle/wrapper/gradle-wrapper.properties index 7ca2b70,63da2ff..f13e8da --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@@ -1,4 -1,4 +1,5 @@@ +#Mon Jun 13 14:56:44 IST 2016 + #Fri Jun 10 16:01:58 GMT+05:30 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME
