diff options
| author | Neil Lathwood <neil@lathwood.co.uk> | 2018-04-27 11:38:06 +0100 |
|---|---|---|
| committer | Neil Lathwood <neil@lathwood.co.uk> | 2018-04-27 11:38:06 +0100 |
| commit | b1194745929043b578c409f794ecb433aa515fa9 (patch) | |
| tree | 133e7103073b707aaca855eb3df4d5025bebae06 /bin | |
| parent | 9156243b9debfc0bc2b05dfe98a910ce5153bf49 (diff) | |
| parent | 34fd5369feee94ab45c5a81d7769b1df717e4c8c (diff) | |
Rebased and fixed conflicts
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/oxidized | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/oxidized b/bin/oxidized index 7a0b03d..92730ee 100755 --- a/bin/oxidized +++ b/bin/oxidized @@ -1,6 +1,5 @@ #!/usr/bin/env ruby - # FIX ME, killing oxidized needs -9 trap("INT") { exit } # sinatra will otherwise steal this from us |