mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-15 09:17:42 +00:00
resolved merge conflicts
This commit is contained in:
commit
c21622d0db
@ -30,7 +30,6 @@
|
|||||||
<copy todir="${basedir}/release/photorec_exec" >
|
<copy todir="${basedir}/release/photorec_exec" >
|
||||||
<fileset dir="${thirdparty.dir}/photorec_exec"/>
|
<fileset dir="${thirdparty.dir}/photorec_exec"/>
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
<!--Copy ewfexport to release-->
|
<!--Copy ewfexport to release-->
|
||||||
<copy todir="${basedir}/release/ewfexport_exec" >
|
<copy todir="${basedir}/release/ewfexport_exec" >
|
||||||
<fileset dir="${thirdparty.dir}/ewfexport_exec"/>
|
<fileset dir="${thirdparty.dir}/ewfexport_exec"/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user