mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 21:00:22 +00:00
removed merge conflict with develop
This commit is contained in:
commit
e86e81de9b
@ -23,4 +23,4 @@ script:
|
|||||||
- echo "testing autopsy..." && echo -en 'travis_fold:start:script.tests\\r'
|
- echo "testing autopsy..." && echo -en 'travis_fold:start:script.tests\\r'
|
||||||
- cd Core/
|
- cd Core/
|
||||||
- xvfb-run ant -q test
|
- xvfb-run ant -q test
|
||||||
- echo -en 'travis_fold:end:script.tests\\r'
|
- echo -en 'travis_fold:end:script.tests\\r'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user