saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove merge conflict line

Browse source
This commit is contained in:
rallytime 2016-04-13 09:05:31 -06:00
parent e0d947c707
commit 46a4e8a310
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ref/configuration/minion.rst
View file

@ -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``