removed merge conflict with develop

This commit is contained in:
rishwanth1995 2018-04-13 13:34:14 -04:00
commit e86e81de9b

View File

@ -23,4 +23,4 @@ script:
- echo "testing autopsy..." && echo -en 'travis_fold:start:script.tests\\r'
- cd Core/
- xvfb-run ant -q test
- echo -en 'travis_fold:end:script.tests\\r'
- echo -en 'travis_fold:end:script.tests\\r'