From 13249b7193d9f3944e59d708e2ad813150bc72d3 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 9 Feb 2018 19:01:49 +0100
Subject: [PATCH] bad merge

---
 src/main/org/apache/tools/ant/util/FlatFileNameMapper.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
index 37383b631..07ba4c6ed 100644
--- a/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
+++ b/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
@@ -52,7 +52,6 @@ public class FlatFileNameMapper implements FileNameMapper {
      */
     @Override
     public String[] mapFileName(String sourceFileName) {
-        return new String[] { new java.io.File(sourceFileName).getName() };
         return sourceFileName == null ? null
             : new String[] {new java.io.File(sourceFileName).getName()};
     }