From 00651a3e38991e60f1a36ba925dd773dc80f8cc0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 25 Sep 2020 11:21:28 +0200
Subject: [PATCH] Fix forward-merge errors in 6f04c7b60e and 687c3985d5

See gh-24865
---
 gradle/docs.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index e2318d0e514..0aff4387608 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -137,7 +137,7 @@ asciidoctorj {
 			sectnums: '',
 			'source-highlighter': 'highlight.js',
 			highlightjsdir: 'js/highlight',
-			'highlightjs-theme': 'github', // 'googlecode',
+			'highlightjs-theme': 'googlecode',
 			stylesdir: 'css/',
 			stylesheet: 'stylesheet.css',
 			'spring-version': project.version