From 098fccc2a65ea88e25189d9b2e9b80bedeed2372 Mon Sep 17 00:00:00 2001
From: Anthony Garrett <37503662+kalisam@users.noreply.github.com>
Date: Sat, 19 Jul 2025 17:09:52 -0400
Subject: [PATCH] Update centroid.rs

---
 src/core/centroid.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/centroid.rs b/src/core/centroid.rs
index 639f9ea..67a958f 100644
--- a/src/core/centroid.rs
+++ b/src/core/centroid.rs
@@ -1,9 +1,6 @@
 use crate::core::vector::Vector;
 use serde::{Deserialize, Serialize};
-<<<<<<< Updated upstream
-=======
 use std::sync::Arc;
->>>>>>> Stashed changes
 use uuid::Uuid;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]