[READY]NTnet refactor, assimilates exonet

code/modules/research/designs/telecomms_designs.dm

@@ -10,6 +10,7 @@
 	build_path = /obj/item/circuitboard/machine/telecomms/receiver
 	category = list("Subspace Telecomms")
 
+<<<<<<< HEAD
 /datum/design/board/exonet_node
 	name = "Machine Design (Exonet Node)"
 	desc = "Allows for the construction of Exonet Node."
@@ -18,6 +19,8 @@
 	build_path = /obj/item/circuitboard/machine/exonet_node
 	category = list("Subspace Telecomms")
 
+=======
+>>>>>>> 92632ec... Merge pull request #32914 from kevinz000/NTNet
 /datum/design/board/telecomms_bus
 	name = "Machine Design (Bus Mainframe)"
 	desc = "Allows for the construction of Telecommunications Bus Mainframes."