Fixed issue #13736: No javascript : bad date not saved but error not …

…shown Dev: we must always control in PHP, js is an user help, not a dev control …
LimeSurvey · Jun 5, 2018 · dfe3f66 · dfe3f66
1 parent 1f4873e
commit dfe3f66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -68,7 +68,6 @@ before_script:
     - java -jar selenium-server-standalone-3.7.1.jar -enablePassThrough false > /dev/null 2> /dev/null &
 
 script:
-<<<<<<< HEAD
     # Check for syntax errors. This line will never halt the tests.
     - find application/ -type f -name "*.php" -exec php -l {} \;  | grep -v 'No syntax errors' || true
     # Run the tests.