diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
commit | 76168e23fd78d276a197cc992bb6ef5a065f6f3f (patch) | |
tree | f15093086b2ff767968e6bbd1b816c66f35bd5dd /script/process/reaper | |
parent | fb2b20037bb176533de4e7fa86701248473f8ee3 (diff) | |
parent | 589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (diff) |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'script/process/reaper')
-rwxr-xr-x | script/process/reaper | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/script/process/reaper b/script/process/reaper index 309764a0d..a03da9387 100755 --- a/script/process/reaper +++ b/script/process/reaper @@ -1,5 +1,3 @@ -#!/usr/bin/ruby - #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../../config/boot.rb' require 'commands/process/reaper' |