Don't let 2016.3 doc config changes overwrite the 2016.11 changes

This commit is contained in:
rallytime 2016-11-28 11:09:35 -07:00
parent dfedd1185a
commit da7f5518eb

View file

@ -245,8 +245,8 @@ if on_saltstack:
copyright = time.strftime("%Y")
# < --- START do not merge these settings to other branches START ---> #
build_type = 'previous' # latest, previous, develop, next
release = previous_release # version, latest_release, previous_release
build_type = 'latest' # latest, previous, develop, next
release = latest_release # version, latest_release, previous_release
# < --- END do not merge these settings to other branches END ---> #
# Set google custom search engine