Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Exit status is 0

  • Loading branch information...
commit 026e52d479501f79c27f3d40c223bce764f1277f 2 parents bc833fa + a100e9e
@ndbroadbent authored
Showing with 11 additions and 0 deletions.
  1. +3 −0  .travis.yml
  2. +8 −0 Rakefile
View
3  .travis.yml
@@ -3,6 +3,9 @@
# - master
# before_script: "echo foo; sleep 200"
+<<<<<<< HEAD
notifications:
on_success: always
on_failure: always
+=======
+>>>>>>> a100e9efef9dec1cb883b8ecfaf32befd239a6b8
View
8 Rakefile
@@ -7,6 +7,7 @@ task :test do
puts "#{key}: #{ENV[key]}"
end
+<<<<<<< HEAD
1.upto(1) do
sleep(0.01)
putc '.'
@@ -14,6 +15,13 @@ task :test do
end
status = File.read("status").strip.to_i rescue 0
exit status
+=======
+ sleep(0.01)
+ putc '.'
+ $stdout.flush
+
+ exit 1
+>>>>>>> a100e9efef9dec1cb883b8ecfaf32befd239a6b8
end
task :default => :test
Please sign in to comment.
Something went wrong with that request. Please try again.