From 9aad38b2c2582a73d72ad0ad22740d07fe0e7ab4 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 23 May 2016 10:39:39 -0700
Subject: [PATCH] merge fix

---
 libraries/avatars/src/AvatarData.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 7d571a826f..61ee649273 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -296,7 +296,7 @@ public:
         QUrl skeletonModelURL;
         QVector<AttachmentData> attachmentData;
         QString displayName;
-        AvatarEntityMap avatarEntityMap;
+        AvatarEntityMap avatarEntityData;
     };
 
     static void parseAvatarIdentityPacket(const QByteArray& data, Identity& identityOut);