From 9c54bc8858806e3552dd0bf30fe0bc640d7da033 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 21 Jun 2021 20:07:22 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../effects/decals/posters/polarisposters_vr.dm      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/code/game/objects/effects/decals/posters/polarisposters_vr.dm b/code/game/objects/effects/decals/posters/polarisposters_vr.dm
index daeed8454a..8c36b5f3f6 100644
--- a/code/game/objects/effects/decals/posters/polarisposters_vr.dm
+++ b/code/game/objects/effects/decals/posters/polarisposters_vr.dm
@@ -1,15 +1,5 @@
-<<<<<<< HEAD
-/datum/poster/nanotrasen/nt_7 //YW EDIT: SolGov, USDF
+/decl/poster/nanotrasen/nt_7 //YW EDIT: SolGov, USDF
 	name = "SolGov"
 	desc = "This poster showcases an USDF emblem. The outer ring reads,\
-||||||| parent of 07f5043a5b... Merge pull request #10698 from VOREStation/upstream-merge-8128
-/datum/poster/nanotrasen/nt_7
-	name = "SolCom"
-	desc = "This poster showcases an TCG emblem. The outer ring reads,\
-=======
-/decl/poster/nanotrasen/nt_7
-	name = "SolCom"
-	desc = "This poster showcases an TCG emblem. The outer ring reads,\
->>>>>>> 07f5043a5b... Merge pull request #10698 from VOREStation/upstream-merge-8128
 	\"<font face='times new roman ms'>NIL MORTALIBUS ARDUI EST</font>\".\
 	Commonwealth of Sol-Procyon."