From 3129c2a85b0b5918446b82be33678b248c6740c5 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 28 Mar 2019 21:34:11 -0400 Subject: [PATCH] Update preferences.dm --- code/modules/client/preferences.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 08991f1edc7..c768d292c7d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -341,8 +341,6 @@ datum/preferences /datum/preferences/proc/close_load_dialog(mob/user) //user << browse(null, "window=saves") panel.close() -<<<<<<< HEAD -======= /datum/preferences/proc/open_copy_dialog(mob/user) var/dat = "" @@ -366,4 +364,3 @@ datum/preferences panel = new(user, "Character Slots", "Character Slots", 300, 390, src) panel.set_content(dat) panel.open() ->>>>>>> 6927ca1... Merge pull request #5988 from PrismaticGynoid/charactercopy