resolved merge conflicts

This commit is contained in:
Brian Carrier 2018-03-14 13:43:47 -04:00
commit c21622d0db

View File

@ -30,7 +30,6 @@
<copy todir="${basedir}/release/photorec_exec" >
<fileset dir="${thirdparty.dir}/photorec_exec"/>
</copy>
<!--Copy ewfexport to release-->
<copy todir="${basedir}/release/ewfexport_exec" >
<fileset dir="${thirdparty.dir}/ewfexport_exec"/>