Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 01AC6200CAC for ; Mon, 19 Jun 2017 12:45:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0046F160BE4; Mon, 19 Jun 2017 10:45:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6E655160BE1 for ; Mon, 19 Jun 2017 12:45:22 +0200 (CEST) Received: (qmail 35065 invoked by uid 500); 19 Jun 2017 10:45:21 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 35056 invoked by uid 99); 19 Jun 2017 10:45:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Jun 2017 10:45:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87EC1DFE22; Mon, 19 Jun 2017 10:45:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulk@apache.org To: commits@groovy.apache.org Message-Id: <5ef8f1453a1040c3b3c23dc285cebaa8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: fix merge glitch Date: Mon, 19 Jun 2017 10:45:21 +0000 (UTC) archived-at: Mon, 19 Jun 2017 10:45:23 -0000 Repository: groovy Updated Branches: refs/heads/GROOVY_2_5_X 20bb8421a -> 177c77edb fix merge glitch Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/177c77ed Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/177c77ed Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/177c77ed Branch: refs/heads/GROOVY_2_5_X Commit: 177c77edb862bf4a913330ba0879144e9053de17 Parents: 20bb842 Author: paulk Authored: Mon Jun 19 20:45:13 2017 +1000 Committer: paulk Committed: Mon Jun 19 20:45:13 2017 +1000 ---------------------------------------------------------------------- build.gradle | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/177c77ed/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 08a4a80..7e3b58e 100644 --- a/build.gradle +++ b/build.gradle @@ -60,11 +60,7 @@ buildScan { } ext.modules = { -<<<<<<< HEAD - subprojects.findAll{ !['performance'].contains(it.name) } -======= subprojects.findAll{ !['performance', 'tests-vm8'].contains(it.name) } ->>>>>>> 27c7205... rename subproject to better reflect that it isn't a normal module } apply from: 'gradle/filter.gradle'