fix warning 'nohup: redirecting stderr to stdout' for resque.sh
There are merge conflicts
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.
Created by: ghost
related issue https://github.com/gitlabhq/gitlabhq/issues/2045
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.