From 90c19ae744db93a1dda61ae5c0bdf33a414eef93 Mon Sep 17 00:00:00 2001
From: kralverde <github@email.kralverde.dev>
Date: Thu, 3 Oct 2024 16:32:06 -0400
Subject: [PATCH] remove git diff and hypot

---
 pumpkin-core/src/math/mod.rs           | 8 --------
 pumpkin-world/src/block/block_state.rs | 1 -
 2 files changed, 9 deletions(-)

diff --git a/pumpkin-core/src/math/mod.rs b/pumpkin-core/src/math/mod.rs
index 29ac634d5..de67a8532 100644
--- a/pumpkin-core/src/math/mod.rs
+++ b/pumpkin-core/src/math/mod.rs
@@ -30,11 +30,3 @@ pub fn magnitude(a: f64, b: f64, c: f64) -> f64 {
 pub const fn get_section_cord(coord: i32) -> i32 {
     coord >> 4
 }
-
-pub fn squared_hypot(a: f64, b: f64) -> f64 {
-    a * a + b * b
-}
-
-pub fn hypot(a: f64, b: f64) -> f64 {
-    squared_hypot(a, b).sqrt()
-}
diff --git a/pumpkin-world/src/block/block_state.rs b/pumpkin-world/src/block/block_state.rs
index 8e9a59e5d..df79018c7 100644
--- a/pumpkin-world/src/block/block_state.rs
+++ b/pumpkin-world/src/block/block_state.rs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 use std::collections::HashMap;
 
 use thiserror::Error;