Quantcast

groovy git commit: one line too many added when doing merge

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

groovy git commit: one line too many added when doing merge

paulk
Repository: groovy
Updated Branches:
  refs/heads/parrot 35f0fa07e -> fff2b2ce5


one line too many added when doing merge


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/fff2b2ce
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/fff2b2ce
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/fff2b2ce

Branch: refs/heads/parrot
Commit: fff2b2ce5798850a840955bc1b41db813bef630e
Parents: 35f0fa0
Author: paulk <[hidden email]>
Authored: Thu May 11 09:34:02 2017 +1000
Committer: paulk <[hidden email]>
Committed: Thu May 11 09:34:02 2017 +1000

----------------------------------------------------------------------
 subprojects/parser-antlr4/build.gradle | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/fff2b2ce/subprojects/parser-antlr4/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/build.gradle b/subprojects/parser-antlr4/build.gradle
index 8e9f0a4..56c9c11 100644
--- a/subprojects/parser-antlr4/build.gradle
+++ b/subprojects/parser-antlr4/build.gradle
@@ -16,7 +16,6 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-if (!rootProject.hasProperty('useAntlr4')) return
 
 apply plugin: 'me.champeau.gradle.antlr4'
 

Loading...