dev_commands 0.0.50 → 0.0.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/timeout.rb +0 -4
- metadata +1 -1
data/lib/timeout.rb
CHANGED
|
@@ -11,11 +11,7 @@
|
|
|
11
11
|
#
|
|
12
12
|
# If you've got a cleaner way of doing this, I'd be interested to see it.
|
|
13
13
|
# If you think you can do it with Ruby's Timeout module, think again.
|
|
14
|
-
<<<<<<< HEAD
|
|
15
|
-
def run_with_timeout(directory, command, timeout, tick)
|
|
16
|
-
=======
|
|
17
14
|
def run_with_timeout(directory,command, timeout, tick)
|
|
18
|
-
>>>>>>> 64a620397b11df71b841ad38df0941319776318a
|
|
19
15
|
output = ''
|
|
20
16
|
exit_code=1
|
|
21
17
|
begin
|