resolve more merge conflicts

kurtosis-tech · Oct 6, 2023 · 4a4f4bf · 4a4f4bf
1 parent 583e82c
commit 4a4f4bf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 199 deletions.
diff --git a/...alized_logs/client_implementations/persistent_volume/log_file_creator/log_file_creator.go b/...alized_logs/client_implementations/persistent_volume/log_file_creator/log_file_creator.go
diff --git a/...centralized_logs/client_implementations/persistent_volume/log_remover/log_remover_test.go b/...centralized_logs/client_implementations/persistent_volume/log_remover/log_remover_test.go
diff --git a/.../engine/centralized_logs/client_implementations/persistent_volume/volume_consts/consts.go b/.../engine/centralized_logs/client_implementations/persistent_volume/volume_consts/consts.go
@@ -24,10 +24,6 @@ const (
 
 	CreateLogsWaitMinutes = 3 * time.Minute
 
-	RemoveLogsWaitHours = 6 * time.Hour
-
-	CreateLogFilesInterval = 3 * time.Minute
-
 	// basepath/enclave uuid/service uuid <filetype>
 	PerFileFmtStr = "%s%s/%s%s"
 

diff --git a/engine/server/webapp/asset-manifest 2.json b/engine/server/webapp/asset-manifest 2.json
@@ -0,0 +1,13 @@
+{
+  "files": {
+    "main.css": "./static/css/main.dbf7687f.css",
+    "main.js": "./static/js/main.6d24e1d7.js",
+    "index.html": "./index.html",
+    "main.dbf7687f.css.map": "./static/css/main.dbf7687f.css.map",
+    "main.6d24e1d7.js.map": "./static/js/main.6d24e1d7.js.map"
+  },
+  "entrypoints": [
+    "static/css/main.dbf7687f.css",
+    "static/js/main.6d24e1d7.js"
+  ]
+}
diff --git a/engine/server/webapp/index 2.html b/engine/server/webapp/index 2.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.6d24e1d7.js"></script><link href="./static/css/main.dbf7687f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.6d24e1d7.js"></script><link href="./static/css/main.dbf7687f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>