From 0b8648a0b1c9ece6a4ec6415d1b4182a6aaf711e Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 9 May 2019 13:42:09 -0400
Subject: [PATCH] delet conflicts

---
 .../modular_computers/computers/subtypes/preset_laptop.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm
index 76ad6052785..3152878fc2d 100644
--- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm
+++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm
@@ -31,10 +31,6 @@
 	battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src)
 	battery_module.charge_to_full()
 
-<<<<<<< HEAD
-	//VOREstation Add Begin
-=======
->>>>>>> b3a875b... Merge pull request #6158 from Novacat/nova-alerts
 /obj/item/modular_computer/laptop/preset/custom_loadout/elite/install_default_hardware()
 	..()
 	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src)
@@ -45,7 +41,3 @@
 	card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
 	battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src)
 	battery_module.charge_to_full()
-<<<<<<< HEAD
-	//VOREstation Add End
-=======
->>>>>>> b3a875b... Merge pull request #6158 from Novacat/nova-alerts