Projects >> core >>2253f90724fecd2be838b016c2d02572d8e08b71

Chunk
Conflicting content 
<<<<<<< HEAD
import java.io.*;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.TrueFileFilter;

import java.math.BigDecimal;
import java.math.MathContext;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
=======
import com.dotmarketing.business.DotStateException;
import com.dotmarketing.util.Config;
import com.dotmarketing.util.Logger;
import com.liferay.util.jna.JNALibrary;
>>>>>>> 41a28ee2da121982e20dce14b9b341617a4c3e88

/**
 * View Source
Solution content 
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.TrueFileFilter;

import java.io.*;
import java.math.BigDecimal;
import java.math.MathContext;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;

/**
 * View Source
File
FileUtil.java
Developer's decision
Version 1
Kind of conflict
Import