resolve master-to-dev conflict

pepkit · May 28, 2017 · a2f74fd · a2f74fd
2 parents bccd053 + 854fc52
commit a2f74fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/doc/source/usage-and-commands.rst b/doc/source/usage-and-commands.rst
@@ -4,7 +4,7 @@ Usage and commands
 
 Looper doesn't just run pipelines; it can also check and summarize the progress of your jobs, as well as remove all files created by them.
 
-Each task is controlled by one of the five main commands ``run``, ``summarize``, ``destroy``, ``check``, ``clean``: 
+Each task is controlled by one of the five main commands ``run``, ``summarize``, ``destroy``, ``check``, ``clean``:
 
 
 .. code-block:: bash