From 2f1d2bc1dcc13023c640d945d039a5538fde58f1 Mon Sep 17 00:00:00 2001
From: Maciej Kotowski <makoteq@gmail.com>
Date: Wed, 6 Oct 2021 17:44:14 +0200
Subject: [PATCH] .

---
 client/src/pages/Home/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/pages/Home/index.js b/client/src/pages/Home/index.js
index 63d9f38..1d57c75 100644
--- a/client/src/pages/Home/index.js
+++ b/client/src/pages/Home/index.js
@@ -11,10 +11,7 @@ import { calculateDistance } from "../../utils/map/calculateDistance";
 import { useHistory } from "react-router";
 import { spawnPopup } from "../../utils/popups/spawnPopup";
 import { spawnError } from "../../utils/popups/spawnError";
-<<<<<<< HEAD
-=======
 import { getUserPos } from "../../utils/getUserPos";
->>>>>>> 3420a282f104ee2c8b24c37ec76fc6aca20ce80f
 
 export const Home = () => {
     useTitle();