From 97fb94b10f407bf53ebc5be4031ad18bec13efa2 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 14 Feb 2021 06:56:57 -0500
Subject: [PATCH] Update preferences_vr.dm

---
 code/modules/client/preferences_vr.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm
index 7761f080de..783ee0c4ae 100644
--- a/code/modules/client/preferences_vr.dm
+++ b/code/modules/client/preferences_vr.dm
@@ -1,15 +1,8 @@
 /datum/preferences
 	var/show_in_directory = 1	//Show in Character Directory
-<<<<<<< HEAD
-||||||| parent of 5fbfdbc931... Merge pull request #9695 from TheFurryFeline/patch-25
-	var/directory_tag = "Unset" //Sorting tag to use in character directory
-	var/directory_erptag = "No ERP"	//ditto, but for non-vore scenes
-	var/directory_ad = ""		//Advertisement stuff to show in character directory.
-=======
 	var/directory_tag = "Unset" //Sorting tag to use in character directory
 	var/directory_erptag = "Unset"	//ditto, but for non-vore scenes
 	var/directory_ad = ""		//Advertisement stuff to show in character directory.
->>>>>>> 5fbfdbc931... Merge pull request #9695 from TheFurryFeline/patch-25
 	var/sensorpref = 5			//Set character's suit sensor level
 	var/job_talon_high = 0
 	var/job_talon_med = 0