浏览代码

merge bork

Ask Solem 8 年之前
父节点
当前提交
4491d4fda7
共有 1 个文件被更改,包括 0 次插入1 次删除
  1. 0 1
      docs/userguide/extending.rst

+ 0 - 1
docs/userguide/extending.rst

@@ -234,7 +234,6 @@ Attributes
 
         class WorkerStep(bootsteps.StartStopStep):
             requires = ('celery.worker.autoreloader:Autoreloader',)
->>>>>>> parent of 8e0ab0f... Removes autoscale option completely
 
 Example worker bootstep
 -----------------------