Resolved Conflicts

src/main/java/net/gepafin/tendermanagement/model/response/S3ConfigBean.java

@@ -0,0 +1,11 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+@Data
+public class S3ConfigBean {
+    private String path;
+    private String type;
+    private String bucketName;
+    private String parentFolder;
+}