From b2592ab132d5ec69a6c04c9051174057e522c0cd Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Mon, 16 Nov 2015 15:30:39 +0100
Subject: [PATCH] Fix a merge conflict

---
 OpenSim/Framework/AvatarAppearance.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 79a66abbd4..07c739d569 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -490,14 +490,7 @@ namespace OpenSim.Framework
                     m_wearables[i] = new AvatarWearable();
             }
             m_wearables[wearableId].Clear();
-<<<<<<< HEAD
             for (int i = 0; i < wearable.Count; i++)
-=======
-            int count = wearable.Count;
-            if (count > AvatarWearable.MAX_WEARABLES)
-                count = AvatarWearable.MAX_WEARABLES;
-            for (int i = 0; i < count; i++)
->>>>>>> master
                 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
         }