1 files changed, 0 insertions, 4 deletions

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 2977195..9dc4489 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -457,12 +457,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         /// <returns>true if they do, false if they don't.</returns>
         private bool CheckPermissions(NPCAvatar av, UUID callerID)
         {
-<<<<<<< HEAD
             return callerID == UUID.Zero || av.OwnerID == UUID.Zero ||
                 av.OwnerID == callerID  || av.AgentId == callerID;
-=======
-            return callerID == UUID.Zero || av.OwnerID == UUID.Zero || av.OwnerID == callerID || av.AgentId == callerID;
->>>>>>> avn/ubitvar
         }
     }
 }