This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e93decd114 Fix merge error
e93decd114 is described below
commit e93decd114d8bbf004817adbf95bebf4cfe55182
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 08:48:16 2022 +0100
Fix merge error
---
build.properties.default | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3eb47b1707..5e531e3318 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -41,8 +41,8 @@ ant.version.required=1.10.2
# ----- Reproducible builds -----
# Uncomment and set to current time for reproducible builds
# Note: The value is in seconds (unlike milliseconds used by
System.currentTimeMillis()).
-+#2022-03-31T12:00:00Z
-+#ant.tstamp.now=1648728000
+#2022-03-31T12:00:00Z
+#ant.tstamp.now=1648728000
# ----- Build control flags -----
compile.debug=true
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
