Cleanup merge

This commit is contained in:
Thomas Jackson 2015-03-18 08:11:38 -07:00
parent 70155ddd49
commit a95f81233c

View File

@ -53,7 +53,6 @@ class RunnerClient(mixins.SyncClientMixin, mixins.AsyncClientMixin, object):
.. code-block:: python
<<<<<<< HEAD
>>> opts = salt.config.master_config('/etc/salt/master')
>>> runner = salt.runner.RunnerClient(opts)
>>> runner.cmd('jobs.list_jobs', [])