[MIRROR] Fix [zhlogo] description

SierraBay · Apr 15, 2024 · 001c74a · 001c74a
1 parent 41882cd
commit 001c74a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/code/modules/codex/entries/paperwork.dm b/code/modules/codex/entries/paperwork.dm
@@ -31,8 +31,14 @@
 \[xynlogo\] - Inserts the Xyngergy logo.<br>
 \[iccgseal\] - Inserts ICCG seal.<br>
 \[fleetlogo\] - Inserts the logo of the SCG Fleet.<br>
+<<<<<<< ours
 \[sfplogo\] - Inserts the logo of the Sol Federal Police.<br><br>
 \[falogo\] - Inserts the logo of the Frontier Alliance.<br><br>
+=======
+\[sfplogo\] - Inserts the logo of the Sol Federal Police.<br>
+\[falogo\] - Inserts the logo of the Frontier Alliance.<br>
+\[zhlogo\] - Inserts the logo of Zeng-Hu Pharmaceuticals.<br><br>
+>>>>>>> theirs
 <b>Digital exclusive commands (NanoWord, emails, reports, text files, etc):</b><br>
 \[pre\] - \[/pre\] : Adds preformatted text, forcing the text to be fixed width.<br>
 \[fontred\] - \[/font\] : Makes the text red.<br>