Granular.jl

commit 8a65193a89eef163299b24b45d95f97d51535388
parent 0efdbe197ae08c9cf07c8ce9c0eb8313545fae3a
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Tue, 18 Apr 2017 22:49:59 -0400

update requirements and check coverage after success

Diffstat:
M
.travis.yml
 | 
2
+-
M
REQUIRE
 | 
3
---

2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,6 @@ notifications:
           - andersd@riseup.net
       on_success: never # default: change
       on_failure: always # default: always
-script:
+after_success:
 # push coverage results to Coveralls
   - julia -e 'Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
diff --git a/REQUIRE b/REQUIRE
@@ -1,6 +1,3 @@
 julia 0.5
-<<<<<<< HEAD
-=======
 WriteVTK
 NetCDF
->>>>>>> origin/master