'#1861 finalizes merge conflicts.

iped-utils/src/main/java/iped/utils/fsw/FileAttributes.java

@@ -9,62 +9,32 @@
 public class FileAttributes implements BasicFileAttributes {
 
     PathWrapper path;
-<<<<<<< HEAD
-
-    public FileAttributes(PathWrapper path) {
-        this.path = path;
-    }
-
-=======
->>>>>>> branch 'OvercomePathWithTrailingSpaces' of https://github.com/sepinf-inc/IPED.git
 
-<<<<<<< HEAD
-    @Override
-    public FileTime lastModifiedTime() {
-        return null;
-=======
     public FileAttributes(PathWrapper path) {
         this.path = path;
->>>>>>> branch 'OvercomePathWithTrailingSpaces' of https://github.com/sepinf-inc/IPED.git
     }
 
     @Override
-<<<<<<< HEAD
-    public FileTime lastAccessTime() {
-=======
     public FileTime lastModifiedTime() {
->>>>>>> branch 'OvercomePathWithTrailingSpaces' of https://github.com/sepinf-inc/IPED.git
         return null;
     }
 
     @Override
-<<<<<<< HEAD
-    public FileTime creationTime() {
-=======
     public FileTime lastAccessTime() {
->>>>>>> branch 'OvercomePathWithTrailingSpaces' of https://github.com/sepinf-inc/IPED.git
         return null;
     }
 
     @Override
-<<<<<<< HEAD
-    public boolean isRegularFile() {
-        return path.toFile().isFile();
-=======
     public FileTime creationTime() {
         return null;
->>>>>>> branch 'OvercomePathWithTrailingSpaces' of https://github.com/sepinf-inc/IPED.git
     }
 
     @Override
-<<<<<<< HEAD
-=======
     public boolean isRegularFile() {
         return path.toFile().isFile();
     }
 
     @Override
->>>>>>> branch 'OvercomePathWithTrailingSpaces' of https://github.com/sepinf-inc/IPED.git
     public boolean isDirectory() {
         try (DirectoryStream ds = Files.newDirectoryStream(path)) {
             Files.newDirectoryStream(path);