From 2a7b1b598742bee3e18b8bc2a8624d4f222eac1e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 26 Apr 2018 18:25:04 +0200
Subject: [PATCH] bad merge

---
 src/main/org/apache/tools/ant/taskdefs/Property.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java
index 1cfd26861..3178796ee 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -511,7 +511,7 @@ public class Property extends Task {
             }
         } else {
             if (url == null && file == null && resource == null
-                && env == null) {
+                && env == null && runtime == null) {
                 throw new BuildException(
                     "You must specify url, file, resource, environment or runtime when not using the name attribute",
                     getLocation());