From 18ba9183e4ed96fc1421bca4d95411f4ebab3020 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@waah.day>
Date: Sun, 16 Jul 2023 22:32:52 -0400
Subject: [PATCH] fix: typo

---
 Dockerfile                                   | 2 +-
 packages/backend/src/daemons/server-stats.ts | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d93398e537..b45b4a1f87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ COPY packages/backend/native-utils/Cargo.lock packages/backend/native-utils/Carg
 COPY packages/backend/native-utils/src/lib.rs packages/backend/native-utils/src/
 COPY packages/backend/native-utils/migration/Cargo.toml packages/backend/native-utils/migration/Cargo.toml
 COPY packages/backend/native-utils/migration/src/lib.rs packages/backend/native-utils/migration/src/
-COPY packages/backend/native-utils/scylla-migration/Cargo.toml packages/backend/native-utils/syclla-migration/Cargo.toml
+COPY packages/backend/native-utils/scylla-migration/Cargo.toml packages/backend/native-utils/scylla-migration/Cargo.toml
 COPY packages/backend/native-utils/scylla-migration/src/lib.rs packages/backend/native-utils/scylla-migration/src/
 
 # Install cargo dependencies
diff --git a/packages/backend/src/daemons/server-stats.ts b/packages/backend/src/daemons/server-stats.ts
index 0f33a6cb07..7d4fcd25e1 100644
--- a/packages/backend/src/daemons/server-stats.ts
+++ b/packages/backend/src/daemons/server-stats.ts
@@ -23,12 +23,7 @@ export default function () {
 
 	fetchMeta().then((meta) => {
 		if (!meta.enableServerMachineStats) return;
-<<<<<<< HEAD
 	});
-=======
-	}
-	);
->>>>>>> 1f5cf72ae7 (fix: :bug: server stats setting, meta fetching)
 
 	async function tick() {
 		const cpu = await cpuUsage();