Merge branch '3.3.x' into 3.4.x
Closes gh-44420
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-2025 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -60,6 +60,6 @@ public class MyServerProperties {
|
||||
public void setPort(int port) {
|
||||
this.port = port;
|
||||
}
|
||||
// fold:off
|
||||
// @fold:off
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-2025 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -65,7 +65,7 @@ public class MyServerProperties {
|
||||
public void setPort(int port) {
|
||||
this.port = port;
|
||||
}
|
||||
// @fold:off // getters/setters ...
|
||||
// @fold:off
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user