From d3127ba97557551b76847a314d9d6d1e76905f6a Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 19 Jun 2017 20:18:39 -0400
Subject: [PATCH] remove unintended merge line

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

diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 7f02de8a29..affd5af147 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -370,7 +370,6 @@ public:
     virtual ~AvatarData();
 
     static const QUrl& defaultFullAvatarModelUrl();
-    QUrl cannonicalSkeletonModelURL(const QUrl& empty) const;
 
     virtual bool isMyAvatar() const { return false; }