# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1709899340 -7200
# Node ID 88e9642306df2979837a32c45a33c02ed20b2768
# Parent  7714b7893dfdef2e1a275f78111cabfbf41c0d95
Oops, wrong creator name separator used.

diff -r 7714b7893dfd -r 88e9642306df world/laenor.loc
--- a/world/laenor.loc	Fri Mar 08 12:56:30 2024 +0200
+++ b/world/laenor.loc	Fri Mar 08 14:02:20 2024 +0200
@@ -50,7 +50,7 @@
 388	; 511	; 0	;@Newbie Playground;@Jacinth,Hackop,Favorit;?22.06.1997;;LQ23 "Liberate newbies".
 463	; 520	; 3	;@Peacock Farm;@Malitrius;?26.06.1998;http://wiz.bat.org/~malitrius/peacock.html;Loosely based on X-Files (TV-series) episode "Home" (S04 E02).
 434	; 522	; 0	;Hunt Master|@Foxhunt;@Zilch;?01.07.1996;;
-422	; 524	; 2G	;Arska's Hut|Prospector's Shack|@Merchant subguild;Shadowjack|Gore|Shinarae|Acidia;?10.12.1996;;
+422	; 524	; 2G	;Arska's Hut|Prospector's Shack|@Merchant subguild;Shadowjack,Gore,Shinarae,Acidia;?10.12.1996;;
 517	; 526	; 0	;Land of Anarchy|Desolate Castle|@Therps castle;@Therp,Bj;16.08.1996;;
 387	; 528	; 2	;Farmhouse|@Farm;@Ruffneck,%Malar;?01.07.2003;;AQ "Save the farmers".
 419	; 539	; 0	;Kilrathi|@Cathedral of Dr. Kilrathi;!Namhas,@Zamphyr;?03.06.1997;;
diff -r 7714b7893dfd -r 88e9642306df world/special.loc
--- a/world/special.loc	Fri Mar 08 12:56:30 2024 +0200
+++ b/world/special.loc	Fri Mar 08 14:02:20 2024 +0200
@@ -16,7 +16,7 @@
 10	; 7	; 0G?	;Infizinity|Tower of Infizinity;@Zin;;;Located in Arelium.
 10	; 8	; 0G?	;Civilized fighters|Civfighters;@Shardik;;;Located in Arelium.
 10	; 9	; 0G?	;Civilized mages|Civmages;;;;Located in Arelium.
-10	; 10	; 0G?	;Merchant;Shadowjack|Gore|Shinarae|Acidia;?10.12.1996;;Located in Arelium. The designs for Merchant guild were codified around late 1996. As with many older guilds, lots of people have worked on the guild code during the years, not all listed here.
+10	; 10	; 0G?	;Merchant;Shadowjack,Gore,Shinarae,Acidia;?10.12.1996;;Located in Arelium. The designs for Merchant guild were codified around late 1996. As with many older guilds, lots of people have worked on the guild code during the years, not all listed here.
 
 # Rilynttar
 20	; 1	; 0?	;@Reaver catacombs;!Juggelo,@Firefox;?11.12.1993;;Located in Rilynttar. Old area originally by Firefox, converted and reopened by Juggelo 16.02.2004. Might have been in the game as early as 1992.