From 5dcad7c40aebd373a96b52408b42b423e91e5228 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 7 Nov 2017 04:38:56 -0600
Subject: [PATCH] Update fullscreen.dm

---
 code/_onclick/hud/fullscreen.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index 900a4a2022..58f0fb18a2 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -174,4 +174,4 @@
 	layer = LIGHTING_LAYER
 	blend_mode = BLEND_ADD
 	show_when_dead = TRUE
->>>>>>> 3a3a779... Scale fullscreen overlays to the view size (#32379)
+