Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2026-02-17 13:52:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

conflict fix again

Browse Source
This commit is contained in:
Anthony Stirling
2025-10-12 21:13:01 +01:00
parent 45c438d66d
commit 884944527e
36 changed files with 74 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
View File

@@ -303,18 +303,11 @@ public class ApplicationProperties {
@Data
public static class Jwt {
<<<<<<< HEAD
private boolean enabled = true;
private boolean keyCleanup = true;
private int keyRetentionDays = 7;
private Boolean secureCookie;
=======
private boolean enableKeystore = true;
private boolean enableKeyRotation = false;
private boolean enableKeyCleanup = true;
private int keyRetentionDays = 7;
private boolean secureCookie;
>>>>>>> refs/remotes/origin/V2
}
}

2
app/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
View File

@@ -4,8 +4,6 @@ package stirling.software.common.model;
* This class will be removed when frontend migration to React is complete
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
@Getter