From 05eca7f22ef998f48026589194550895e8375ed0 Mon Sep 17 00:00:00 2001
From: Filip Maj <filipmaj@gmail.com>
Date: Fri, 17 Nov 2017 16:51:35 -0500
Subject: [PATCH] Fixed bad merge.

---
 FFXIVClassic Map Server/FFXIVClassic Map Server.csproj | 3 ---
 FFXIVClassic Map Server/WorldManager.cs                | 1 -
 2 files changed, 4 deletions(-)

diff --git a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
index c0dd50c5..5ff268f7 100644
--- a/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj	
+++ b/FFXIVClassic Map Server/FFXIVClassic Map Server.csproj	
@@ -265,9 +265,6 @@
     <Compile Include="packets\send\recruitment\RecruiterStatePacket.cs" />
     <Compile Include="packets\send\recruitment\StartRecruitingResponse.cs" />
     <Compile Include="packets\send\search\ItemSearchClosePacket.cs" />
-    <Compile Include="packets\send\search\RetainerResultEndPacket.cs" />
-    <Compile Include="packets\send\search\RetainerResultUpdatePacket.cs" />
-    <Compile Include="packets\send\search\RetainerResultBodyPacket.cs" />
     <Compile Include="packets\send\search\PlayerSearchResult.cs" />
     <Compile Include="packets\send\search\ItemSearchResult.cs" />
     <Compile Include="packets\send\search\PlayerSearchCommentResultPacket.cs" />
diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs
index 12e82dde..26d2d847 100644
--- a/FFXIVClassic Map Server/WorldManager.cs	
+++ b/FFXIVClassic Map Server/WorldManager.cs	
@@ -3,7 +3,6 @@ using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.actors.area;
 using FFXIVClassic_Map_Server.actors.chara.npc;
 using FFXIVClassic_Map_Server.Actors;
-using FFXIVClassic.Common;
 using FFXIVClassic_Map_Server.dataobjects;
 using FFXIVClassic_Map_Server.dataobjects.chara;
 using FFXIVClassic_Map_Server.lua;