Skip to content

Commit

Permalink
Remove merge conflict line
Browse files Browse the repository at this point in the history
  • Loading branch information
rallytime committed Apr 13, 2016
1 parent e0d947c commit 46a4e8a
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion doc/ref/configuration/minion.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ Statically assigns grains to the minion.
cabinet: 13
cab_u: 14-15
>>>>>>> Document "grains" setting in the minion configuration reference
.. conf_minion:: grains_cache

``grains_cache``
Expand Down

0 comments on commit 46a4e8a

Please sign in to comment.