From a206544f98f4f6ce81c7cab02659e4c4e727d9f7 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Sat, 29 Oct 2022 17:12:57 +1000
Subject: [PATCH] Conflict resolution

---
 code/modules/vehicles/construction.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/vehicles/construction.dm b/code/modules/vehicles/construction.dm
index 7b6aa903d8a..c5683140c88 100644
--- a/code/modules/vehicles/construction.dm
+++ b/code/modules/vehicles/construction.dm
@@ -39,12 +39,8 @@
 	icon_state = "quad-frame"
 	pixel_x = -16
 
-<<<<<<< HEAD
 /obj/item/weapon/vehicle_assembly/quadbike/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
 	..()
-=======
-/obj/item/vehicle_assembly/quadbike/attackby(var/obj/item/W as obj, var/mob/user as mob)
->>>>>>> 62b57acf8cc... Snowmobiles and Quadhancements V2 (#8776)
 
 	switch(build_stage)
 		if(0)